diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-06 22:39:58 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-06 22:39:58 +0000 |
| commit | da0263a3443fc4a4b5f81114d645e2e70d1941ae (patch) | |
| tree | 5ebd80fffcd2d2ae1498ccd0b94fbace885e9c3b | |
| parent | cdd7fba642b5db8b5dc1fb8ab9adc19b81b3e367 (diff) | |
| download | gcc-48-da0263a3443fc4a4b5f81114d645e2e70d1941ae.tar.gz | |
* Fix java.security symlink in libgcj14. Closes: #746786.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@7358 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/rules.d/binary-java.mk | 16 |
2 files changed, 7 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index dc60c5a..e8feeda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ gcc-4.8 (4.8.2-22) UNRELEASED; urgency=medium * Fix the as and ld symlinks for the hppa64 cross compiler. * Ensure that the common libs (built from the next GCC version) are available when building without common libs. + * Fix java.security symlink in libgcj14. Closes: #746786. -- Matthias Klose <doko@debian.org> Mon, 05 May 2014 20:29:25 +0200 diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk index da1f978..8ca4a9f 100644 --- a/debian/rules.d/binary-java.mk +++ b/debian/rules.d/binary-java.mk @@ -425,14 +425,6 @@ $(binary_stamp)-java: $(install_stamp) # DH_COMPAT=2 dh_movefiles -p$(p_jqt) $(files_jqt) #endif -# FIXME -# $(jvm_dir) $(PF)/lib/jvm/$(jvm_name_long) \ - -# FIXME this actually is in p_jlib ... -# dh_link -p$(p_jrehl) \ -# $(PF)/lib/security/classpath.security \ -# $(jvm_dir)/jre/lib/security/java.security - dh_link -p$(p_jrehl) \ $(jvm_dir) $(PF)/lib/jvm/java-gcj$(pkg_ver) \ $(PF)/bin/gij$(pkg_ver) $(jvm_dir)/bin/gij \ @@ -456,9 +448,13 @@ ifneq ($(DEB_TARGET_ARCH_CPU),$(java_cpu)) endif dh_link -p$(p_jlib) \ - etc/java/cacerts-gcj $(jvm_dir)/jre/lib/cacerts \ + /etc/java/cacerts-gcj /$(jvm_dir)/jre/lib/cacerts \ $(foreach i, jvm javamath, \ - $(gcj_vlibdir)/lib$(i).so $(jvm_dir)/lib/lib$(i).so) + /$(gcj_vlibdir)/lib$(i).so /$(jvm_dir)/lib/lib$(i).so) + + dh_link -p$(p_jlib) \ + /etc/security/classpath.security \ + /$(jvm_dir)/jre/lib/security/java.security dh_link -p$(p_jlibx) \ $(foreach i, jawt, $(gcj_vlibdir)/lib$(i).so $(jvm_dir)/lib/lib$(i).so) |