View | Details | Raw Unified | Return to bug 233033
Collapse All | Expand All

(-)i/lang/swi-pl/Makefile (+4 lines)
Lines 58-63 PLIST_SUB+= BITS=64 Link Here
58
ARCH=		x86_64
58
ARCH=		x86_64
59
.endif
59
.endif
60
60
61
.if (${ARCH} == aarch64)
62
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-skip-gnu-qsort
63
.endif
64
61
post-configure:
65
post-configure:
62
.if ${ARCH} != i386
66
.if ${ARCH} != i386
63
	@${REINPLACE_CMD} -e '/^CMFLAGS=/s/$$/ -fPIC/' \
67
	@${REINPLACE_CMD} -e '/^CMFLAGS=/s/$$/ -fPIC/' \
(-)i/lang/swi-pl/files/extra-patch-skip-gnu-qsort (+55 lines)
Added Link Here
1
--- src/configure.orig	2018-11-06 17:02:55 UTC
2
+++ src/configure
3
@@ -8796,52 +8796,6 @@ if test "x$ac_cv_func_qsort_r" = xyes; then
4
 $as_echo "$as_me: checking \"GNU style qsort_r()\"..." >&6;}
5
   qsort_r_gnu=no
6
 
7
-  if test "$cross_compiling" = yes; then :
8
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10
-as_fn_error $? "cannot run test program while cross compiling
11
-See \`config.log' for more details" "$LINENO" 5; }
12
-else
13
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14
-/* end confdefs.h.  */
15
-
16
-#define _GNU_SOURCE
17
-#include <stdlib.h>
18
-
19
-static int
20
-mycompare(const void *p1, const void *p2, void *c)
21
-{ const int *s1 = p1;
22
-  const int *s2 = p2;
23
-  int *ip = c;
24
-
25
-  if ( *ip != 1 )
26
-    exit(1);
27
-
28
-  return *s1 - *s2;
29
-}
30
-
31
-int
32
-main(int argc, char**argv)
33
-{ int data[] = {0,1,2,3,4,5,6,7,8,9};
34
-  int ctx = 1;
35
-
36
-  qsort_r(data, 10, sizeof(int), mycompare, (void*)&ctx);
37
-  return 0;
38
-}
39
-
40
-_ACEOF
41
-if ac_fn_c_try_run "$LINENO"; then :
42
-
43
-$as_echo "#define QSORT_R_GNU 1" >>confdefs.h
44
-
45
-qsort_r_gnu=yes
46
-else
47
-  true
48
-fi
49
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
50
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
51
-fi
52
-
53
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qsort_r_gnu" >&5
54
 $as_echo "$qsort_r_gnu" >&6; }
55
 fi

Return to bug 233033