| --- mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 |
| +++ mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 |
| @@ -112,6 +112,10 @@ |
| MKSHLIB += -R '$$ORIGIN' |
| endif |
| |
| +ifeq ($(OS_ARCH), Linux) |
| +DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' |
| +endif |
| + |
| ifeq ($(OS_ARCH),OS2) |
| MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def |
| GARBAGE += $(MAPFILE) |
| --- mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 |
| +++ mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 |
| @@ -102,6 +102,10 @@ |
| MKSHLIB += -R '$$ORIGIN' |
| endif |
| |
| +ifeq ($(OS_ARCH), Linux) |
| +DSO_LDOPTS += -Wl,-R,'$$ORIGIN' |
| +endif |
| + |
| ifeq ($(OS_ARCH),OS2) |
| MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def |
| GARBAGE += $(MAPFILE) |
| --- mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 |
| +++ mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 |
| @@ -168,6 +168,7 @@ |
| else |
| OS_LIBS = -ldl |
| endif |
| +DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' |
| endif |
| |
| ifeq ($(OS_ARCH),HP-UX) |
| --- mozilla/nsprpub/config/Makefile.in.orig 2005-06-01 14:28:23.000000000 +0000 |
| +++ mozilla/nsprpub/config/Makefile.in 2006-01-15 04:13:42.000000000 +0000 |
| @@ -54,7 +54,7 @@ |
| # because it is included by every makefile. |
| DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config |
| |
| -RELEASE_BINS = nspr-config |
| +RELEASE_BINS = nspr-config nspr.pc |
| |
| include $(topsrcdir)/config/config.mk |
| |
| @@ -139,6 +139,7 @@ |
| |
| export:: $(TARGETS) |
| rm -f $(dist_bindir)/nspr-config |
| + rm -f $(dist_bindir)/nspr.pc |
| |
| ifdef WRAP_SYSTEM_INCLUDES |
| export:: |
| --- mozilla/nsprpub/config/nspr.pc.in.orig 1970-01-01 00:00:00.000000000 +0000 |
| +++ mozilla/nsprpub/config/nspr.pc.in 2006-01-15 04:12:23.000000000 +0000 |
| @@ -0,0 +1,10 @@ |
| +prefix=@prefix@ |
| +exec_prefix=@exec_prefix@ |
| +libdir=@libdir@ |
| +includedir=@includedir@ |
| + |
| +Name: NSPR |
| +Description: The Netscape Portable Runtime |
| +Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ |
| +Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 @OS_LIBS@ -Wl,-R${libdir} |
| +Cflags: -I${includedir} |
| --- mozilla/nsprpub/configure.orig 2006-01-15 04:17:59.000000000 +0000 |
| +++ mozilla/nsprpub/configure 2006-01-15 04:21:35.000000000 +0000 |
| @@ -5899,6 +5899,7 @@ |
| config/nsprincl.mk |
| config/nsprincl.sh |
| config/nspr-config |
| +config/nspr.pc |
| lib/Makefile |
| lib/ds/Makefile |
| lib/libc/Makefile |
| --- mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 |
| +++ mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 |
| @@ -122,7 +122,7 @@ |
| fi |
| |
| if test "$echo_libs" = "yes"; then |
| - libdirs=-L$libdir |
| + libdirs="-Wl,-R$libdir -L$libdir" |
| if test -n "$lib_plds"; then |
| libdirs="$libdirs -lplds${major_version}" |
| fi |
