Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/0eadab86611f2881c3ca02a1d1438a96fd126995
...commit
http://git.netsurf-browser.org/toolchains.git/commit/0eadab86611f2881c3ca02a1d1438a96fd126995
...tree
http://git.netsurf-browser.org/toolchains.git/tree/0eadab86611f2881c3ca02a1d1438a96fd126995
The branch, master has been updated
via 0eadab86611f2881c3ca02a1d1438a96fd126995 (commit)
via 998e25a87d4230424a4cad2f4c6ce82d50f75840 (commit)
from d2981349612e42e1aa9777b9b02e8d109a11e56c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=0eadab86611f2881c3ca02a1d1438a96fd126995
commit 0eadab86611f2881c3ca02a1d1438a96fd126995
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Ensure IPv6 disabled on Amiga platforms
diff --git a/sdk/Makefile b/sdk/Makefile
index 125dfce..d8c4bc7 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -128,7 +128,7 @@ endif
ifeq ($(TARGET),ppc-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
$(COMMON_SDK_ITEMS) libjpeg-turbo.d)
EXTRAARGS_LIBCARES := --disable-shared
- EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--enable-threaded-resolver LIBS=-lpthread
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--enable-threaded-resolver --disable-ipv6 LIBS=-lpthread
endif
ifeq ($(TARGET),i686-w64-mingw32)
@@ -142,7 +142,7 @@ endif
ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d
libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared --without-random
- EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-amissl --with-zlib --disable-rt
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-amissl --with-zlib --disable-rt
--disable-ipv6
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
LIBJPEG_ENV := LDFLAGS="-lm"
LIBJPEG_TURBO_ENV := LDFLAGS="-lm"
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=998e25a87d4230424a4cad2f4c6ce82d50f75840
commit 998e25a87d4230424a4cad2f4c6ce82d50f75840
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix libiconv patches
srclib.time.in.h needs patching because the clib2 includes define tv_sec to
tv_secs
diff --git
a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
index 3d7938d..314a4b1 100644
--- a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
+++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
@@ -1,8 +1,8 @@
---- srclib/getprogname.c 2017-01-01 23:02:21.000000000 +0000
-+++ srclib/getprogname.c 2017-03-26 23:21:25.532012988 +0100
-@@ -144,7 +144,7 @@ getprogname (void)
+--- srclib/getprogname.c 2019-04-26 19:29:00.000000000 +0100
++++ srclib/getprogname.c 2020-03-06 19:32:44.157018596 +0000
+@@ -245,7 +245,7 @@ getprogname (void)
}
- return p;
+ return NULL;
# else
-# error "getprogname module not ported to this OS"
+ const char *p = ""; /* this is never used for anything important */
diff --git
a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
new file mode 100644
index 0000000..1ea2d0e
--- /dev/null
+++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
@@ -0,0 +1,11 @@
+--- srclib/time.in.h 2019-01-06 08:51:41.000000000 +0000
++++ srclib/time.in.h 2020-03-06 19:46:37.429016156 +0000
+@@ -70,7 +70,7 @@ extern "C" {
+ # define timespec rpl_timespec
+ struct timespec
+ {
+- time_t tv_sec;
++ time_t tv_secs;
+ long int tv_nsec;
+ };
+ # define GNULIB_defined_struct_timespec 1
diff --git a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
index 3d7938d..314a4b1 100644
--- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
+++ b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
@@ -1,8 +1,8 @@
---- srclib/getprogname.c 2017-01-01 23:02:21.000000000 +0000
-+++ srclib/getprogname.c 2017-03-26 23:21:25.532012988 +0100
-@@ -144,7 +144,7 @@ getprogname (void)
+--- srclib/getprogname.c 2019-04-26 19:29:00.000000000 +0100
++++ srclib/getprogname.c 2020-03-06 19:32:44.157018596 +0000
+@@ -245,7 +245,7 @@ getprogname (void)
}
- return p;
+ return NULL;
# else
-# error "getprogname module not ported to this OS"
+ const char *p = ""; /* this is never used for anything important */
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 4 ++--
.../libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p | 8 ++++----
.../libiconv/m68k-unknown-amigaos/srclib.time.in.h.p | 11 +++++++++++
.../patches/libiconv/ppc-amigaos/srclib.getprogname.c.p | 8 ++++----
4 files changed, 21 insertions(+), 10 deletions(-)
create mode 100644
sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
diff --git a/sdk/Makefile b/sdk/Makefile
index 125dfce..d8c4bc7 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -128,7 +128,7 @@ endif
ifeq ($(TARGET),ppc-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
$(COMMON_SDK_ITEMS) libjpeg-turbo.d)
EXTRAARGS_LIBCARES := --disable-shared
- EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--enable-threaded-resolver LIBS=-lpthread
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--enable-threaded-resolver --disable-ipv6 LIBS=-lpthread
endif
ifeq ($(TARGET),i686-w64-mingw32)
@@ -142,7 +142,7 @@ endif
ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d
libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared --without-random
- EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-amissl --with-zlib --disable-rt
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-amissl --with-zlib --disable-rt
--disable-ipv6
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
LIBJPEG_ENV := LDFLAGS="-lm"
LIBJPEG_TURBO_ENV := LDFLAGS="-lm"
diff --git
a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
index 3d7938d..314a4b1 100644
--- a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
+++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
@@ -1,8 +1,8 @@
---- srclib/getprogname.c 2017-01-01 23:02:21.000000000 +0000
-+++ srclib/getprogname.c 2017-03-26 23:21:25.532012988 +0100
-@@ -144,7 +144,7 @@ getprogname (void)
+--- srclib/getprogname.c 2019-04-26 19:29:00.000000000 +0100
++++ srclib/getprogname.c 2020-03-06 19:32:44.157018596 +0000
+@@ -245,7 +245,7 @@ getprogname (void)
}
- return p;
+ return NULL;
# else
-# error "getprogname module not ported to this OS"
+ const char *p = ""; /* this is never used for anything important */
diff --git
a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
new file mode 100644
index 0000000..1ea2d0e
--- /dev/null
+++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
@@ -0,0 +1,11 @@
+--- srclib/time.in.h 2019-01-06 08:51:41.000000000 +0000
++++ srclib/time.in.h 2020-03-06 19:46:37.429016156 +0000
+@@ -70,7 +70,7 @@ extern "C" {
+ # define timespec rpl_timespec
+ struct timespec
+ {
+- time_t tv_sec;
++ time_t tv_secs;
+ long int tv_nsec;
+ };
+ # define GNULIB_defined_struct_timespec 1
diff --git a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
index 3d7938d..314a4b1 100644
--- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
+++ b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
@@ -1,8 +1,8 @@
---- srclib/getprogname.c 2017-01-01 23:02:21.000000000 +0000
-+++ srclib/getprogname.c 2017-03-26 23:21:25.532012988 +0100
-@@ -144,7 +144,7 @@ getprogname (void)
+--- srclib/getprogname.c 2019-04-26 19:29:00.000000000 +0100
++++ srclib/getprogname.c 2020-03-06 19:32:44.157018596 +0000
+@@ -245,7 +245,7 @@ getprogname (void)
}
- return p;
+ return NULL;
# else
-# error "getprogname module not ported to this OS"
+ const char *p = ""; /* this is never used for anything important */
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
