pass -Wl,-R... when linking shared libraries on FreeBSD. The runtime
linker seemingly does not pass the rpath down from binaries to shared libs, resulting in libs not being able to find other libs they require. patch from taya@, tested on FreeBSD 5.0.
This commit is contained in:
parent
451b1a4959
commit
06b520598c
5 changed files with 52 additions and 23 deletions
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.38 2003/03/17 16:07:33 taya Exp $
|
||||
$NetBSD: distinfo,v 1.39 2003/04/27 09:49:06 grant Exp $
|
||||
|
||||
SHA1 (mozilla-source-1.3.tar.bz2) = fba8d38058740d45913f6ae1080fbbc3091ae901
|
||||
Size (mozilla-source-1.3.tar.bz2) = 31128975 bytes
|
||||
SHA1 (patch-aa) = 2563b28ee0df35ae57fbcde30163b5d7c234ea68
|
||||
SHA1 (patch-ab) = bd2e050fc4a5921ed43a4679d963ddadd6654a93
|
||||
SHA1 (patch-ab) = 8447517ec289181829c958cd1b93b6663a86c87c
|
||||
SHA1 (patch-ac) = ead2209e8e7b2080d1813a084fc3ee60795d595f
|
||||
SHA1 (patch-ad) = a96cc108816a064200ad5064a2070c7cfd99e88b
|
||||
SHA1 (patch-ae) = 7f43871b9ba696e1c6a1a8fc3746221acb4a602b
|
||||
|
@ -15,5 +15,5 @@ SHA1 (patch-bb) = 70e07fb06469157d49df8a5b9bc90378820d902e
|
|||
SHA1 (patch-be) = f8046c3bd5c29214d5b9ace250fcf83e57a361fd
|
||||
SHA1 (patch-bm) = 7fa8e9701df888a52329b4ecc76ad166038fce06
|
||||
SHA1 (patch-bn) = 475190596a9d143b659ff95d23c8b024acf41d88
|
||||
SHA1 (patch-bo) = 8d3a046716460343596b5602172adbdd28242f05
|
||||
SHA1 (patch-bo) = 6763f73c5736e9414e05495a9f92d7c7c8110d91
|
||||
SHA1 (patch-bp) = 486763c887979accc405066aa3cf55693d79b3fc
|
||||
|
|
|
@ -1,9 +1,18 @@
|
|||
$NetBSD: patch-ab,v 1.27 2003/03/17 16:07:34 taya Exp $
|
||||
$NetBSD: patch-ab,v 1.28 2003/04/27 09:49:06 grant Exp $
|
||||
|
||||
diff -ru ../Orig/mozilla/configure.in ./configure.in
|
||||
--- ../Orig/mozilla/configure.in 2003-03-08 06:25:31.000000000 +0900
|
||||
+++ ./configure.in 2003-03-14 16:58:39.000000000 +0900
|
||||
@@ -1134,6 +1134,13 @@
|
||||
--- configure.in.orig 7 Mar 2003 21:25:31 -0000
|
||||
+++ configure.in 15 Apr 2003 14:53:02 -0000
|
||||
@@ -859,6 +859,9 @@
|
||||
# MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
|
||||
# MKSHLIB_UNFORCE_ALL=''
|
||||
# fi
|
||||
+ if test "$LIBRUNPATH"; then
|
||||
+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
|
||||
+ fi
|
||||
;;
|
||||
|
||||
*-hpux*)
|
||||
@@ -1134,6 +1137,13 @@
|
||||
if test "$LIBRUNPATH"; then
|
||||
DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
|
||||
fi
|
||||
|
@ -17,7 +26,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
|
|||
;;
|
||||
|
||||
*-nto*)
|
||||
@@ -1493,7 +1500,7 @@
|
||||
@@ -1493,7 +1503,7 @@
|
||||
[siginfo_t* info;],
|
||||
[ac_cv_siginfo_t=true],
|
||||
[ac_cv_siginfo_t=false])])
|
||||
|
@ -26,7 +35,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
|
|||
AC_DEFINE(HAVE_SIGINFO_T)
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
@@ -2037,9 +2044,6 @@
|
||||
@@ -2037,9 +2047,6 @@
|
||||
CXXFLAGS="$CXXFLAGS -mt"
|
||||
fi
|
||||
;;
|
||||
|
|
|
@ -1,9 +1,18 @@
|
|||
$NetBSD: patch-bo,v 1.2 2003/03/17 16:07:35 taya Exp $
|
||||
$NetBSD: patch-bo,v 1.3 2003/04/27 09:49:06 grant Exp $
|
||||
|
||||
diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
|
||||
--- ../Orig/mozilla/nsprpub/configure.in 2003-01-21 05:49:52.000000000 +0900
|
||||
+++ ./nsprpub/configure.in 2003-03-14 16:59:14.000000000 +0900
|
||||
@@ -2144,7 +2144,14 @@
|
||||
--- nsprpub/configure.in.orig 20 Jan 2003 20:49:52 -0000
|
||||
+++ nsprpub/configure.in 15 Apr 2003 14:51:35 -0000
|
||||
@@ -929,6 +929,9 @@
|
||||
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
|
||||
MDCPUCFG_H=_freebsd.cfg
|
||||
PR_MD_CSRCS=freebsd.c
|
||||
+ if test "$LIBRUNPATH"; then
|
||||
+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
|
||||
+ fi
|
||||
;;
|
||||
|
||||
*-hpux*)
|
||||
@@ -2144,7 +2147,14 @@
|
||||
_PTHREAD_LDFLAGS="-lc_r"
|
||||
fi
|
||||
;;
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.6 2003/02/02 11:47:58 drochner Exp $
|
||||
$NetBSD: distinfo,v 1.7 2003/04/27 09:49:05 grant Exp $
|
||||
|
||||
SHA1 (mozilla-phoenix-0.5.tar.bz2) = cd4fb41baaf6c4a62991c37bd7fe0acf49dca8df
|
||||
Size (mozilla-phoenix-0.5.tar.bz2) = 30378315 bytes
|
||||
SHA1 (patch-aa) = ae806aba2a5687ac04ed7623e31bfd45a75d71aa
|
||||
SHA1 (patch-ab) = d9eead7e79f75ff2dd756b04ee987b014c2d9f22
|
||||
SHA1 (patch-ab) = 8447517ec289181829c958cd1b93b6663a86c87c
|
||||
SHA1 (patch-ac) = 263f8a4f4cf4016979e23bcd796a8178d0b34b3c
|
||||
SHA1 (patch-ad) = 08cb069fad6e15eb1acba25165bae947621ab512
|
||||
SHA1 (patch-ae) = 65e0cf54a59253b0cb9c563be04e4664027e6aff
|
||||
|
@ -15,4 +15,5 @@ SHA1 (patch-be) = 53eba663f1b872f3ad7f689d1655dc66fa50aa01
|
|||
SHA1 (patch-bj) = c088b47768518d0b5eec44d49a4ce83f51ce090a
|
||||
SHA1 (patch-bm) = 2b905bae67ccd719528c40988784f534b0623fad
|
||||
SHA1 (patch-bn) = fe5152d4f4bb8bd791249237f0dcd14e11ba27d1
|
||||
SHA1 (patch-bo) = 6763f73c5736e9414e05495a9f92d7c7c8110d91
|
||||
SHA1 (patch-ca) = dc934034eb3d45ec94e382eeea716bbc73752854
|
||||
|
|
|
@ -1,8 +1,18 @@
|
|||
$NetBSD: patch-ab,v 1.2 2002/12/10 16:02:40 taya Exp $
|
||||
$NetBSD: patch-ab,v 1.3 2003/04/27 09:49:05 grant Exp $
|
||||
|
||||
--- ../Orig/mozilla/configure.in Mon Dec 9 12:18:31 2002
|
||||
+++ ./configure.in Tue Dec 10 08:32:45 2002
|
||||
@@ -1137,6 +1137,13 @@
|
||||
--- configure.in.orig 7 Mar 2003 21:25:31 -0000
|
||||
+++ configure.in 15 Apr 2003 14:53:02 -0000
|
||||
@@ -859,6 +859,9 @@
|
||||
# MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
|
||||
# MKSHLIB_UNFORCE_ALL=''
|
||||
# fi
|
||||
+ if test "$LIBRUNPATH"; then
|
||||
+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
|
||||
+ fi
|
||||
;;
|
||||
|
||||
*-hpux*)
|
||||
@@ -1134,6 +1137,13 @@
|
||||
if test "$LIBRUNPATH"; then
|
||||
DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
|
||||
fi
|
||||
|
@ -16,7 +26,7 @@ $NetBSD: patch-ab,v 1.2 2002/12/10 16:02:40 taya Exp $
|
|||
;;
|
||||
|
||||
*-nto*)
|
||||
@@ -1494,7 +1501,7 @@
|
||||
@@ -1493,7 +1503,7 @@
|
||||
[siginfo_t* info;],
|
||||
[ac_cv_siginfo_t=true],
|
||||
[ac_cv_siginfo_t=false])])
|
||||
|
@ -25,7 +35,7 @@ $NetBSD: patch-ab,v 1.2 2002/12/10 16:02:40 taya Exp $
|
|||
AC_DEFINE(HAVE_SIGINFO_T)
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
@@ -2028,9 +2035,6 @@
|
||||
@@ -2037,9 +2047,6 @@
|
||||
CXXFLAGS="$CXXFLAGS -mt"
|
||||
fi
|
||||
;;
|
||||
|
|
Loading…
Reference in a new issue