Attachment #59167 for bug #89052

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

Lines 78-84 Link Here

(-)Makefile (-1 / +6 lines)
78		78
79	PLIST= ${WRKDIR}/pkg-plist	79	PLIST= ${WRKDIR}/pkg-plist
80	MOZ_EXTENSIONS= default	80	MOZ_EXTENSIONS= default
81	CONFIGURE_ENV= LOCALBASE=${LOCALBASE}	81	CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} LDFLAGS="${LDFLAGS} -Wl,-rpath,${X11BASE}/lib/mozilla"
82	PKGINSTALL= ${WRKDIR}/pkg-install	82	PKGINSTALL= ${WRKDIR}/pkg-install
83	PKGDEINSTALL= ${WRKDIR}/pkg-deinstall	83	PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
84	FREETYPE_LIB= libfreetype.so.9	84	FREETYPE_LIB= libfreetype.so.9
Lines 244-249 Link Here
244	${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp	244	${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
245	@${REINPLACE_CMD} -E -e 's\|libfreetype\.so\.[0-9]+\|${FREETYPE_LIB}\|g' \	245	@${REINPLACE_CMD} -E -e 's\|libfreetype\.so\.[0-9]+\|${FREETYPE_LIB}\|g' \
246	${WRKSRC}/modules/libpref/src/init/all.js	246	${WRKSRC}/modules/libpref/src/init/all.js
		247	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|' \
		248	${WRKSRC}/nsprpub/config/nspr-config.in ${WRKSRC}/nsprpub/config/autoconf.mk.in
247	@for pcfile in ${PKGCONFIG_FILES}; do \	249	@for pcfile in ${PKGCONFIG_FILES}; do \
248	${REINPLACE_CMD} -e 's\|mozilla-xpcom\|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}\|g ; \	250	${REINPLACE_CMD} -e 's\|mozilla-xpcom\|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}\|g ; \
249	s\|mozilla-nspr\|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}\|g' \	251	s\|mozilla-nspr\|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}\|g' \
Lines 269-274 Link Here
269	${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \	271	${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
270	${FALSE}; \	272	${FALSE}; \
271	fi	273	fi
		274
		275	post-build:
		276	${REINPLACE_CMD} -e "s\|$Libs:.$$$$$\|\1 -Wl,-rpath,${PREFIX}/lib/mozilla\2\|" ${WRKSRC}/build/unix/.pc
272		277
273	pre-install:	278	pre-install:
274	${RM} -rf ${FAKEDIR} ${PLIST}	279	${RM} -rf ${FAKEDIR} ${PLIST}





$FreeBSD$

--- nsprpub/config/autoconf.mk.in.orig
+++ nsprpub/config/autoconf.mk.in
@@ -32,8 +32,8 @@
 MOD_MINOR_VERSION = @MOD_MINOR_VERSION@
 MOD_PATCH_VERSION = @MOD_PATCH_VERSION@
 
-LIBNSPR		= @LIBNSPR@
-LIBPLC		= @LIBPLC@
+LIBNSPR		= -Wl,-rpath,%%PREFIX%%/lib/mozilla @LIBNSPR@
+LIBPLC		= -Wl,-rpath,%%PREFIX%%/lib/mozilla @LIBPLC@
 
 CROSS_COMPILE	= @CROSS_COMPILE@
 BUILD_OPT	= @MOZ_OPTIMIZE@





$FreeBSD$

--- nsprpub/config/nspr-config.in.orig
+++ nsprpub/config/nspr-config.in
@@ -95,7 +95,7 @@
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs=-L${exec_prefix}/lib
+      libdirs="-Wl,-rpath,%%PREFIX%%/lib/mozilla -L${exec_prefix}/lib"
       if test -n "$lib_plds"; then
 	libdirs="$libdirs -lplds${major_version}"
       fi

Return to bug 89052

Added Link Here

(-)files/patch-nsprpub_config_autoconf.mk.in (+16 lines)
1
2	$FreeBSD$
3
4	--- nsprpub/config/autoconf.mk.in.orig
5	+++ nsprpub/config/autoconf.mk.in
6	@@ -32,8 +32,8 @@
7	MOD_MINOR_VERSION = @MOD_MINOR_VERSION@
8	MOD_PATCH_VERSION = @MOD_PATCH_VERSION@
9
10	-LIBNSPR = @LIBNSPR@
11	-LIBPLC = @LIBPLC@
12	+LIBNSPR = -Wl,-rpath,%%PREFIX%%/lib/mozilla @LIBNSPR@
13	+LIBPLC = -Wl,-rpath,%%PREFIX%%/lib/mozilla @LIBPLC@
14
15	CROSS_COMPILE = @CROSS_COMPILE@
16	BUILD_OPT = @MOZ_OPTIMIZE@

Added Link Here

(-)files/patch-nsprpub_config_nspr-config.in (+14 lines)
1
2	$FreeBSD$
3
4	--- nsprpub/config/nspr-config.in.orig
5	+++ nsprpub/config/nspr-config.in
6	@@ -95,7 +95,7 @@
7	fi
8
9	if test "$echo_libs" = "yes"; then
10	- libdirs=-L${exec_prefix}/lib
11	+ libdirs="-Wl,-rpath,%%PREFIX%%/lib/mozilla -L${exec_prefix}/lib"
12	if test -n "$lib_plds"; then
13	libdirs="$libdirs -lplds${major_version}"
14	fi