summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorSean Bruno <sbruno@FreeBSD.org>2014-09-21 15:36:25 +0000
committerSean Bruno <sbruno@FreeBSD.org>2014-09-21 15:36:25 +0000
commite286403320cc18ff34a87de704f8935251bda6b5 (patch)
treee4a9b256d4b6fe478fb80251ac4fdc53cbf072d1 /x11-toolkits
parent- Allow staging as a regular user (diff)
Patch configure to use ${CC} instead of ld to link the two shared objects it
creates. This fixes a problem on arm where the shared object will attempt to access symbols in libgcc, however the .so files don't link against libgcc the build fails. PR: 193791 Submitted by: andrew Reviewed by: tijl Approved by: bapt (mentor)
Notes
Notes: svn path=/head/; revision=368772
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/blt/files/patch-configure15
1 files changed, 13 insertions, 2 deletions
diff --git a/x11-toolkits/blt/files/patch-configure b/x11-toolkits/blt/files/patch-configure
index 108d6da50a92..b5144b516fd9 100644
--- a/x11-toolkits/blt/files/patch-configure
+++ b/x11-toolkits/blt/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig 2010-11-30 17:51:02.000000000 -0500
-+++ configure
+--- configure.orig 2010-11-30 22:51:02.000000000 +0000
++++ configure 2014-09-13 06:33:34.000000000 +0000
@@ -975,7 +975,7 @@ cat > conftest.$ac_ext << EOF
#line 976 "configure"
#include "confdefs.h"
@@ -141,3 +141,14 @@
# Not available on all versions: check for include file.
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
+@@ -4110,8 +4114,8 @@ fi
+
+ if test "$test_ok" = yes; then
+ SHLIB_CFLAGS="-fpic"
+- SHLIB_LD="ld"
+- SHLIB_LD_FLAGS="-Bshareable -x"
++ SHLIB_LD="${CC}"
++ SHLIB_LD_FLAGS="-shared -Wl,-x"
+ fi
+ ;;
+