diff --git a/build.sh b/build.sh index 3989297..83f3a29 100755 --- a/build.sh +++ b/build.sh @@ -150,6 +150,7 @@ popd &>/dev/null patch -p0 < $PATCH_DIR/cctools-ld64-1.patch patch -p0 < $PATCH_DIR/cctools-ld64-2.patch patch -p1 < $PATCH_DIR/cctools-ld64-linux-ncpus.patch +patch -p1 < $PATCH_DIR/cctools-ld64-qsort_r.patch echo "" CONFFLAGS="--prefix=$TARGET_DIR --target=x86_64-apple-$TARGET " CONFFLAGS+="--disable-clang-as " diff --git a/patches/cctools-ld64-qsort_r.patch b/patches/cctools-ld64-qsort_r.patch new file mode 100644 index 0000000..5ebe826 --- /dev/null +++ b/patches/cctools-ld64-qsort_r.patch @@ -0,0 +1,27 @@ +commit 86ee16d49f06c07fb7d208d6f082b4a63c077293 +Author: Johannes Schickel +Date: Fri Feb 12 14:51:14 2016 +0100 + + Fix build on systems with glibc's qsort_r. + +diff --git cctools/ld64/src/3rd/qsort_r.c cctools/ld64/src/3rd/qsort_r.c +index a514ad8..1bae250 100644 +--- cctools/ld64/src/3rd/qsort_r.c ++++ cctools/ld64/src/3rd/qsort_r.c +@@ -28,7 +28,6 @@ + */ + + #define I_AM_QSORT_R +-#define qsort_r qsort_r_local + + #include + +@@ -37,6 +36,8 @@ + #include + #include + ++#define qsort_r qsort_r_local ++ + #ifndef __FreeBSD__ + /* flsl.c */ + int