Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-05-10 21:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add ld64 qsort_r patch (https://github.com/tpoechtrager/cctools-port/pull/19)

Browse Source
This commit is contained in:
Thomas Pöchtrager 2016-03-29 20:35:47 +02:00
parent ec95acda33
commit 672ee7a229
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.sh
View File

@ -150,6 +150,7 @@ popd &>/dev/null
patch -p0 < $PATCH_DIR/cctools-ld64-1.patch patch -p0 < $PATCH_DIR/cctools-ld64-1.patch
patch -p0 < $PATCH_DIR/cctools-ld64-2.patch patch -p0 < $PATCH_DIR/cctools-ld64-2.patch
patch -p1 < $PATCH_DIR/cctools-ld64-linux-ncpus.patch patch -p1 < $PATCH_DIR/cctools-ld64-linux-ncpus.patch
patch -p1 < $PATCH_DIR/cctools-ld64-qsort_r.patch
echo "" echo ""
CONFFLAGS="--prefix=$TARGET_DIR --target=x86_64-apple-$TARGET " CONFFLAGS="--prefix=$TARGET_DIR --target=x86_64-apple-$TARGET "
CONFFLAGS+="--disable-clang-as " CONFFLAGS+="--disable-clang-as "

27
patches/cctools-ld64-qsort_r.patch Normal file
View File

@ -0,0 +1,27 @@
commit 86ee16d49f06c07fb7d208d6f082b4a63c077293
Author: Johannes Schickel <lordhoto [AT] gmail>
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 <sys/cdefs.h>
@@ -37,6 +36,8 @@
#include <stdlib.h>
#include <string.h>
+#define qsort_r qsort_r_local
+
#ifndef __FreeBSD__
/* flsl.c */
int