summaryrefslogtreecommitdiff
path: root/debian/patches/libjava-rpath.diff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2012-11-17 22:56:23 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2012-11-17 22:56:23 +0000
commit9ce75680dbf209d1adcfbaceaa9080221aa84a62 (patch)
tree3ec4c701802d1254f7f0ed7f94ce74abc15cfc5b /debian/patches/libjava-rpath.diff
downloadgcc-48-9ce75680dbf209d1adcfbaceaa9080221aa84a62.tar.gz
- start 4.8
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@6242 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/patches/libjava-rpath.diff')
-rw-r--r--debian/patches/libjava-rpath.diff29
1 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/libjava-rpath.diff b/debian/patches/libjava-rpath.diff
new file mode 100644
index 0000000..b664e9c
--- /dev/null
+++ b/debian/patches/libjava-rpath.diff
@@ -0,0 +1,29 @@
+# DP: - Link ecjx with -rpath $(dbexecdir)
+
+---
+ libjava/Makefile.am | 2 +-
+ libjava/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/libjava/Makefile.am
++++ b/src/libjava/Makefile.am
+@@ -888,7 +888,7 @@ else !ENABLE_SHARED
+ ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) -fbootclasspath=$(BOOTCLASSPATH)
+ endif !ENABLE_SHARED
+
+-ecjx_LDADD = -L$(here)/.libs $(extra_ldflags)
++ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) -rpath $(dbexecdir)
+ ecjx_DEPENDENCIES = libgcj.la libgcj.spec
+ if USE_LIBGCJ_BC
+ ecjx_DEPENDENCIES += libgcj_bc.la
+--- a/src/libjava/Makefile.in
++++ b/src/libjava/Makefile.in
+@@ -8360,7 +8360,7 @@ ECJX_BASE_FLAGS = -findirect-dispatch \
+ @NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+ @NATIVE_FALSE@ecjx_LDADD =
+ @NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) \
+-@NATIVE_TRUE@ $(am__append_21)
++@NATIVE_TRUE@ $(am__append_21) -rpath $(dbexecdir)
+ @NATIVE_FALSE@ecjx_DEPENDENCIES =
+ @NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \
+ @NATIVE_TRUE@ $(am__append_20)