From 8a361ac4bd1b3d5d643b7eb18fe86aa5ef53a079 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 19 Dec 2014 15:47:03 +0000 Subject: Fix libiconv m68k-amigaos build --- sdk/Makefile | 2 +- .../m68k-unknown-amigaos/srclib.signal.in.h.p | 72 +++++++++++++++++++ .../m68k-unknown-amigaos/srclib.sigprocmask.c.p | 80 ++++++++++++++++++++++ .../m68k-unknown-amigaos/srclib.unistd.in.h.p | 43 ++++++++++++ 4 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p create mode 100644 sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.sigprocmask.c.p create mode 100644 sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p diff --git a/sdk/Makefile b/sdk/Makefile index 1de8dc0..8d02603 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -126,7 +126,7 @@ ifeq ($(TARGET),i686-w64-mingw32) endif ifeq ($(TARGET),m68k-unknown-amigaos) - SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d $(COMMON_SDK_ITEMS)) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS)) EXTRAARGS_LIBCARES := --disable-shared --without-random endif diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p new file mode 100644 index 0000000..93ee6a9 --- /dev/null +++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p @@ -0,0 +1,72 @@ +--- srclib/signal.in.h.orig 2011-08-07 14:42:06.000000000 +0100 ++++ srclib/signal.in.h 2014-01-15 00:57:27.620548058 +0000 +@@ -168,69 +168,6 @@ + + # endif + +-/* Test whether a given signal is contained in a signal set. */ +-# if @HAVE_POSIX_SIGNALBLOCKING@ +-/* This function is defined as a macro on MacOS X. */ +-# if defined __cplusplus && defined GNULIB_NAMESPACE +-# undef sigismember +-# endif +-# else +-_GL_FUNCDECL_SYS (sigismember, int, (const sigset_t *set, int sig) +- _GL_ARG_NONNULL ((1))); +-# endif +-_GL_CXXALIAS_SYS (sigismember, int, (const sigset_t *set, int sig)); +-_GL_CXXALIASWARN (sigismember); +- +-/* Initialize a signal set to the empty set. */ +-# if @HAVE_POSIX_SIGNALBLOCKING@ +-/* This function is defined as a macro on MacOS X. */ +-# if defined __cplusplus && defined GNULIB_NAMESPACE +-# undef sigemptyset +-# endif +-# else +-_GL_FUNCDECL_SYS (sigemptyset, int, (sigset_t *set) _GL_ARG_NONNULL ((1))); +-# endif +-_GL_CXXALIAS_SYS (sigemptyset, int, (sigset_t *set)); +-_GL_CXXALIASWARN (sigemptyset); +- +-/* Add a signal to a signal set. */ +-# if @HAVE_POSIX_SIGNALBLOCKING@ +-/* This function is defined as a macro on MacOS X. */ +-# if defined __cplusplus && defined GNULIB_NAMESPACE +-# undef sigaddset +-# endif +-# else +-_GL_FUNCDECL_SYS (sigaddset, int, (sigset_t *set, int sig) +- _GL_ARG_NONNULL ((1))); +-# endif +-_GL_CXXALIAS_SYS (sigaddset, int, (sigset_t *set, int sig)); +-_GL_CXXALIASWARN (sigaddset); +- +-/* Remove a signal from a signal set. */ +-# if @HAVE_POSIX_SIGNALBLOCKING@ +-/* This function is defined as a macro on MacOS X. */ +-# if defined __cplusplus && defined GNULIB_NAMESPACE +-# undef sigdelset +-# endif +-# else +-_GL_FUNCDECL_SYS (sigdelset, int, (sigset_t *set, int sig) +- _GL_ARG_NONNULL ((1))); +-# endif +-_GL_CXXALIAS_SYS (sigdelset, int, (sigset_t *set, int sig)); +-_GL_CXXALIASWARN (sigdelset); +- +-/* Fill a signal set with all possible signals. */ +-# if @HAVE_POSIX_SIGNALBLOCKING@ +-/* This function is defined as a macro on MacOS X. */ +-# if defined __cplusplus && defined GNULIB_NAMESPACE +-# undef sigfillset +-# endif +-# else +-_GL_FUNCDECL_SYS (sigfillset, int, (sigset_t *set) _GL_ARG_NONNULL ((1))); +-# endif +-_GL_CXXALIAS_SYS (sigfillset, int, (sigset_t *set)); +-_GL_CXXALIASWARN (sigfillset); +- + /* Return the set of those blocked signals that are pending. */ + # if !@HAVE_POSIX_SIGNALBLOCKING@ + _GL_FUNCDECL_SYS (sigpending, int, (sigset_t *set) _GL_ARG_NONNULL ((1))); diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.sigprocmask.c.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.sigprocmask.c.p new file mode 100644 index 0000000..a811881 --- /dev/null +++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.sigprocmask.c.p @@ -0,0 +1,80 @@ +--- srclib/sigprocmask.c.orig 2011-08-07 14:42:06.000000000 +0100 ++++ srclib/sigprocmask.c 2014-01-15 00:59:33.130968152 +0000 +@@ -83,77 +83,6 @@ + # define signal ext_signal + #endif + +-int +-sigismember (const sigset_t *set, int sig) +-{ +- if (sig >= 0 && sig < NSIG) +- { +- #ifdef SIGABRT_COMPAT +- if (sig == SIGABRT_COMPAT) +- sig = SIGABRT; +- #endif +- +- return (*set >> sig) & 1; +- } +- else +- return 0; +-} +- +-int +-sigemptyset (sigset_t *set) +-{ +- *set = 0; +- return 0; +-} +- +-int +-sigaddset (sigset_t *set, int sig) +-{ +- if (sig >= 0 && sig < NSIG) +- { +- #ifdef SIGABRT_COMPAT +- if (sig == SIGABRT_COMPAT) +- sig = SIGABRT; +- #endif +- +- *set |= 1U << sig; +- return 0; +- } +- else +- { +- errno = EINVAL; +- return -1; +- } +-} +- +-int +-sigdelset (sigset_t *set, int sig) +-{ +- if (sig >= 0 && sig < NSIG) +- { +- #ifdef SIGABRT_COMPAT +- if (sig == SIGABRT_COMPAT) +- sig = SIGABRT; +- #endif +- +- *set &= ~(1U << sig); +- return 0; +- } +- else +- { +- errno = EINVAL; +- return -1; +- } +-} +- +- +-int +-sigfillset (sigset_t *set) +-{ +- *set = ((2U << (NSIG - 1)) - 1) & ~ SIGABRT_COMPAT_MASK; +- return 0; +-} +- + /* Set of currently blocked signals. */ + static volatile sigset_t blocked_set /* = 0 */; + diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p new file mode 100644 index 0000000..eecac92 --- /dev/null +++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p @@ -0,0 +1,43 @@ +--- srclib/unistd.in.h.orig 2014-01-15 01:06:20.525844246 +0000 ++++ srclib/unistd.in.h 2014-01-15 01:06:48.717471325 +0000 +@@ -1145,40 +1145,6 @@ + #endif + + +-#if @GNULIB_READLINK@ +-/* Read the contents of the symbolic link FILE and place the first BUFSIZE +- bytes of it into BUF. Return the number of bytes placed into BUF if +- successful, otherwise -1 and errno set. +- See the POSIX:2001 specification +- . */ +-# if @REPLACE_READLINK@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# define readlink rpl_readlink +-# endif +-_GL_FUNCDECL_RPL (readlink, ssize_t, +- (const char *file, char *buf, size_t bufsize) +- _GL_ARG_NONNULL ((1, 2))); +-_GL_CXXALIAS_RPL (readlink, ssize_t, +- (const char *file, char *buf, size_t bufsize)); +-# else +-# if !@HAVE_READLINK@ +-_GL_FUNCDECL_SYS (readlink, ssize_t, +- (const char *file, char *buf, size_t bufsize) +- _GL_ARG_NONNULL ((1, 2))); +-# endif +-_GL_CXXALIAS_SYS (readlink, ssize_t, +- (const char *file, char *buf, size_t bufsize)); +-# endif +-_GL_CXXALIASWARN (readlink); +-#elif defined GNULIB_POSIXCHECK +-# undef readlink +-# if HAVE_RAW_DECL_READLINK +-_GL_WARN_ON_USE (readlink, "readlink is unportable - " +- "use gnulib module readlink for portability"); +-# endif +-#endif +- +- + #if @GNULIB_READLINKAT@ + # if !@HAVE_READLINKAT@ + _GL_FUNCDECL_SYS (readlinkat, ssize_t, -- cgit v1.2.3