github/amiga-gcc
1
0
Fork 0
mirror of https://github.com/bebbo/amiga-gcc.git synced 2025-11-21 11:42:05 +00:00
Code Releases Activity

Merge pull request #286 from christoph-fassbach/issue-285

Browse Source 
Issue 285
This commit is contained in:
Stefan "Bebbo" Franke
2022-06-27 07:31:57 +02:00
committed by GitHub
parent 5c917ef538 34a90d4084
commit 1701f3844d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -38,8 +38,8 @@ $(foreach modu,$(modules),$(eval $(modu)_URL=$(call get_url,$(modu))))
$(foreach modu,$(modules),$(eval $(modu)_BRANCH=$(call get_branch,$(modu))))
ifeq ($(NDK),3.2)
NDK_URL := http://aminet.net/dev/misc/NDK3.2R3.lha
NDK_ARC_NAME := NDK3.2R3
NDK_URL := http://aminet.net/dev/misc/NDK3.2.lha
NDK_ARC_NAME := NDK3.2
NDK_FOLDER_NAME := NDK3.2
NDK_FOLDER_NAME_H := NDK3.2/Include_H
NDK_FOLDER_NAME_I := NDK3.2/Include_I
@ -714,7 +714,7 @@ $(BUILD)/ndk-include_proto: $(PROJECTS)/$(NDK_FOLDER_NAME).info
@echo "done" >$@
$(PROJECTS)/$(NDK_FOLDER_NAME).info: $(BUILD)/_lha_done $(DOWNLOAD)/$(NDK_ARC_NAME).lha $(shell find 2>/dev/null patches/$(NDK_FOLDER_NAME)/ -type f)
$(L0)"unpack ndk"$(L1) cd $(PROJECTS) && lha xf $(DOWNLOAD)/$(NDK_ARC_NAME).lha $(L2)
$(L0)"unpack ndk"$(L1) cd $(PROJECTS) && lha xfw=NDK3.2 $(DOWNLOAD)/$(NDK_ARC_NAME).lha $(L2)
@touch -t 0001010000 $(DOWNLOAD)/$(NDK_ARC_NAME).lha
$(L0)"patch ndk"$(L1) for i in $$(find patches/$(NDK_FOLDER_NAME)/ -type f); do \
if [[ "$$i" == *.diff ]] ; \

12
patches/NDK3.2/Include_H/devices/timer.h.diff
View File

@ -1,14 +1,14 @@
--- old/devices/timer.h 2021-04-13 02:41:06.000000000 +0200
+++ new/devices/timer.h 2021-08-10 16:38:04.990455793 +0200
@@ -53,10 +53,19 @@
--- old/devices/timer.h 2022-02-03 11:59:06.000000000 +0100
+++ new/devices/timer.h 2022-06-27 00:29:43.590685664 +0200
@@ -71,10 +71,19 @@
#ifndef __USE_NEW_TIMEVAL__
+#ifndef _TIMEVAL_DEFINED
+#define _TIMEVAL_DEFINED
struct timeval {
- ULONG tv_secs;
- ULONG tv_micro;
- ULONG tv_secs;
- ULONG tv_micro;
+ union {
+ ULONG tv_sec; /* seconds */
+ ULONG tv_secs;
@ -21,4 +21,4 @@
+#endif
struct timerequest {
struct IORequest tr_node;
struct IORequest tr_node;