diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2020-03-06 19:51:57 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2020-03-06 19:51:57 +0000 |
commit | 998e25a87d4230424a4cad2f4c6ce82d50f75840 (patch) | |
tree | 2f9567e2f887a43fff4bf2e86a7df08897a2d4e5 | |
parent | d2981349612e42e1aa9777b9b02e8d109a11e56c (diff) | |
download | toolchains-998e25a87d4230424a4cad2f4c6ce82d50f75840.tar.gz toolchains-998e25a87d4230424a4cad2f4c6ce82d50f75840.tar.bz2 |
Fix libiconv patches
srclib.time.in.h needs patching because the clib2 includes define tv_sec to tv_secs
3 files changed, 19 insertions, 8 deletions
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 */ |