diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 09:03:47 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 09:03:47 +0100 |
commit | b1792baaf8cb1686e463e98e9142ee611a14feaf (patch) | |
tree | f49875a1e3b6869f1e4d452de0957479d61f0786 /toolchain/uClibc | |
parent | 8471b19838d6f6acc2825d6f0b1007e29f7e350f (diff) | |
parent | 4210ea9c8f69095fa0efaf5247f6c12925dcb4f0 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain/uClibc')
-rw-r--r-- | toolchain/uClibc/Makefile | 4 | ||||
-rw-r--r-- | toolchain/uClibc/patches/xxx-sparc-wait4.patch | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 232c3944e..7e53b5d21 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -120,8 +120,8 @@ endif ln -s libc.so.0 $(STAGING_TARGET_DIR)/lib/libc.so # cleanup toolchain -find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete - PATH="$(TARGET_PATH)" prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR) - prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR) + PATH="$(TARGET_PATH)" debug='' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR) + debug='' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR) touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/uClibc/patches/xxx-sparc-wait4.patch b/toolchain/uClibc/patches/xxx-sparc-wait4.patch new file mode 100644 index 000000000..e219ed773 --- /dev/null +++ b/toolchain/uClibc/patches/xxx-sparc-wait4.patch @@ -0,0 +1,12 @@ +diff -Nur uClibc-0.9.33.2.orig/include/sys/wait.h uClibc-0.9.33.2/include/sys/wait.h +--- uClibc-0.9.33.2.orig/include/sys/wait.h 2014-03-01 19:15:53.000000000 +0100 ++++ uClibc-0.9.33.2/include/sys/wait.h 2014-03-01 19:16:42.000000000 +0100 +@@ -176,7 +176,7 @@ + #endif /* Use BSD. */ + + #ifdef _LIBC +-extern __pid_t __wait4_nocancel(__pid_t, __WAIT_STATUS, int, struct rusage *) attribute_hidden; ++extern __pid_t __wait4_nocancel(__pid_t, __WAIT_STATUS, int, struct rusage *); + #endif + + |