diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-29 11:27:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-29 12:02:26 +0200 |
| commit | 34ca8dd9adb62c1154f979887a38483d73da978b (patch) | |
| tree | 86907a50ccfefcd088c6c04e56f08542dfaf0caa /stlport | |
| parent | cc9c380b157d03ca10d66c66f4500ddaf5e42f7e (diff) | |
fdo#54015: At least FreeBSD ld requires -z origin when RPATH contains $ORIGIN
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>:
* bulk replacement of "-Wl,-z,origin,-rpath,..." with
"-Wl,-z,origin -Wl,rpath,..."
* additional hunk for directory/c-sdk/config/FreeBSD.mk in
moz/seamonkey-source-1.1.14.patch did not apply and has been dropped
Change-Id: Ie60c696f041108e819ce8f799cff6f58e63a5ad7
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/STLport-4.5.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stlport/STLport-4.5.patch b/stlport/STLport-4.5.patch index 0a0027594ad3..dd6b499ee156 100644 --- a/stlport/STLport-4.5.patch +++ b/stlport/STLport-4.5.patch @@ -137,7 +137,7 @@ +# +# +LINK=ar cr -+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} -fexceptions -shared -o ++DYN_LINK=${CXX} -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} -fexceptions -shared -o + +OBJEXT=o +DYNEXT=so @@ -449,7 +449,7 @@ +# +# +LINK=ar cr -+DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' -fexceptions -shared -o ++DYN_LINK=$(CXX) -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' -fexceptions -shared -o + +OBJEXT=o +DYNEXT=so |