cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add -Wl,-rpath,'$(installdir)' to LDFLAGS when linking mozilla libs, so

Browse Source 
that when they are dlopen()'ed they can tell ld.so where to go hunt for
the other mozilla libs they depend on.
Similar fix as done in xulrunner 1.8 patch-config_rules_mk 2 years ago
by martynas@, needed to convert py-gnome-extras to xulrunner 1.9.
No fallout on firefox.
This commit is contained in:
landry 2010-07-19 13:46:27 +00:00
parent cfcfe348c4
commit f4a0328f42
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/xulrunner/1.9/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2010/07/15 19:28:46 espie Exp $
# $OpenBSD: Makefile,v 1.18 2010/07/19 13:46:27 landry Exp $
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
VERSION= 1.9.2.6
REVISION-main= 0
REVISION-main= 1
REVISION-devel= 3
DIRECTORY= xulrunner1.9
# needed for mozilla.port.mk

4
www/mozilla-firefox/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.142 2010/07/09 15:43:54 landry Exp $
# $OpenBSD: Makefile,v 1.143 2010/07/19 13:46:27 landry Exp $
COMMENT = Mozilla web browser
@ -8,7 +8,7 @@ MOZILLA_BRANCH = 1.9.2
MOZILLA_PROJECT = mozilla-firefox
MOZILLA_CODENAME = browser
PKGNAME = ${MOZILLA_PROJECT}-${MOZILLA_VERSION}p0
REVISION = 1
SO_VERSION = 22.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.

12
www/mozilla-firefox/patches/patch-config_rules_mk
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-config_rules_mk,v 1.7 2010/04/26 19:55:58 landry Exp $
--- config/rules.mk.orig Wed Jan 6 05:35:11 2010
+++ config/rules.mk Sun Jan 10 17:47:23 2010
@@ -606,6 +606,12 @@ endif
$OpenBSD: patch-config_rules_mk,v 1.8 2010/07/19 13:46:27 landry Exp $
Add -rpath $(installdir) to be sure libxul/libxpcom can open their
depending libs when being dlopen()'ed themselves
--- config/rules.mk.orig Sat Jun 26 07:27:42 2010
+++ config/rules.mk Thu Jul 15 23:17:14 2010
@@ -606,6 +606,14 @@ endif
endif
endif
@ -9,6 +11,8 @@ $OpenBSD: patch-config_rules_mk,v 1.7 2010/04/26 19:55:58 landry Exp $
+ifdef IS_COMPONENT
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+endif
+DSO_LDOPTS += -Wl,-rpath,'$(installdir)'
+OS_LDFLAGS += -Wl,-rpath,'$(installdir)'
+endif
+
ifeq ($(OS_ARCH),Linux)