diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:26:40 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:26:40 +0000 |
| commit | cdafdc254bf8c3ea53cf24363a39db81090375da (patch) | |
| tree | e113d062e11b64b70c8370725050e5de10281565 /moz | |
| parent | 65c3bcaf66ec292516e5c40193072ad6b73a3dc0 (diff) | |
INTEGRATION: CWS sb71 (1.14.6); FILE MERGED
2007/10/02 09:08:07 sb 1.14.6.3: RESYNC: (1.15-1.16); FILE MERGED
2007/07/18 08:45:39 sb 1.14.6.2: RESYNC: (1.14-1.15); FILE MERGED
2007/06/14 09:43:22 sb 1.14.6.1: #i75466# Adapted RPATHs to find shared libraries in extracted URE.
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/mozilla-source-1.7.5.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/moz/mozilla-source-1.7.5.patch b/moz/mozilla-source-1.7.5.patch index 21fcb7d38c2b..a3afa22a9b42 100644 --- a/moz/mozilla-source-1.7.5.patch +++ b/moz/mozilla-source-1.7.5.patch @@ -214,9 +214,9 @@ + # Shared library RUNPATH linker option(s) + # + ifeq ($(OS_ARCH),Linux) -+ EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN ++ EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib + ifdef IS_COMPONENT -+ EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN/.. ++ EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib + endif # IS_COMPONENT + endif # Linux + @@ -599,7 +599,7 @@ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-rpath,'$\$ORIGIN'" ++ DSO_LDOPTS="$DSO_LDOPTS -Wl,-rpath,'$\$ORIGIN:$\$ORIGIN/../ure-link/lib'" OS_LIBS="$OS_LIBS -lc" _OPTIMIZE_FLAGS=-O2 _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that @@ -696,7 +696,7 @@ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-rpath,'$\$ORIGIN'" ++ DSO_LDOPTS="$DSO_LDOPTS -Wl,-rpath,'$\$ORIGIN:$\$ORIGIN/../ure-link/lib'" OS_LIBS="$OS_LIBS -lc" _OPTIMIZE_FLAGS=-O2 _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that @@ -7870,7 +7870,7 @@ endif + ifeq ($(OS_ARCH),Linux) -+ MKSHLIB += -Wl,-rpath,\$$ORIGIN ++ MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib + endif + ifeq ($(OS_ARCH),SunOS) @@ -7879,7 +7879,7 @@ GARBAGE += $(MAPFILE) ifdef NS_USE_GCC ifdef GCC_USE_GNU_LD -! MKSHLIB += -Wl,--version-script,$(MAPFILE) -Wl,-rpath,\$$ORIGIN +! MKSHLIB += -Wl,--version-script,$(MAPFILE) -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib else ! MKSHLIB += -Wl,-M,$(MAPFILE) -Wl,-R,'$$ORIGIN' endif @@ -7915,7 +7915,7 @@ endif + ifeq ($(OS_ARCH),Linux) -+ MKSHLIB += -Wl,-rpath,\$$ORIGIN ++ MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib + endif + ifeq ($(OS_ARCH),SunOS) @@ -7924,7 +7924,7 @@ GARBAGE += $(MAPFILE) ifdef NS_USE_GCC ifdef GCC_USE_GNU_LD -! MKSHLIB += -Wl,--version-script,$(MAPFILE) -Wl,-rpath,\$$ORIGIN +! MKSHLIB += -Wl,--version-script,$(MAPFILE) -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib else ! MKSHLIB += -Wl,-M,$(MAPFILE) -Wl,-R,'$$ORIGIN' endif @@ -8075,7 +8075,7 @@ DSO_CFLAGS = -fPIC DSO_LDOPTS = -shared -+ DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN ++ DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib DSO_LDFLAGS = # INCLUDES += -I/usr/include -Y/usr/include/linux @@ -8189,7 +8189,7 @@ DSO_LDOPTS += -m64 endif DSO_LDOPTS += -shared -h $(notdir $@) -+ DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN ++ DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib else ifeq ($(USE_64), 1) ifeq ($(OS_TEST),i86pc) |