diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-06 22:41:11 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-06 22:41:11 +0000 |
| commit | 80cb1508b9096e8b08ea9c8801676b00638661e4 (patch) | |
| tree | ba8d4e444eb6be73bfc2f6e2984e85aa747152c9 /debian/rules.d | |
| parent | 11ea3552588a4512a0681452248ec53870145461 (diff) | |
| download | gcc-49-80cb1508b9096e8b08ea9c8801676b00638661e4.tar.gz | |
* Fix java.security symlink in libgcj15. Addresses: #746786.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7359 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules.d')
| -rw-r--r-- | debian/rules.d/binary-java.mk | 16 |
1 files changed, 6 insertions, 10 deletions
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) |