diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2019-11-19 17:35:47 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2019-11-19 17:35:47 +0300 |
| commit | 03bebac19e6fef19299d7326d3ee41f8a7dd1316 (patch) | |
| tree | bb413d22ada331790f08b7b9a592e5ab95cd8918 /debian/patches/libjava-fixed-symlinks.diff | |
| parent | 94a19f31b81e9e7e295414fe2ad2302e0db25a08 (diff) | |
| parent | 8f6c4b0033c72f8ac14694c419a99458339dd6a9 (diff) | |
| download | gcc-9-03bebac19e6fef19299d7326d3ee41f8a7dd1316.tar.gz | |
Merge tag 'debian/9.2.1-19'
Diffstat (limited to 'debian/patches/libjava-fixed-symlinks.diff')
| -rw-r--r-- | debian/patches/libjava-fixed-symlinks.diff | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/debian/patches/libjava-fixed-symlinks.diff b/debian/patches/libjava-fixed-symlinks.diff deleted file mode 100644 index 2ac0015..0000000 --- a/debian/patches/libjava-fixed-symlinks.diff +++ /dev/null @@ -1,28 +0,0 @@ -# DP: Remove unneed '..' elements from symlinks in JAVA_HOME - -Index: b/src/libjava/Makefile.am -=================================================================== ---- a/src/libjava/Makefile.am -+++ b/src/libjava/Makefile.am -@@ -836,7 +836,7 @@ if CREATE_JAVA_HOME - $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS) - relative() { \ - $(PERL) -e 'use File::Spec; \ -- print File::Spec->abs2rel($$ARGV[0], $$ARGV[1])' $$1 $$2; \ -+ print File::Spec->abs2rel($$ARGV[0], $$ARGV[1])' $$1 $$2 | sed -r 's,(bin|lib)[^/]*/\.\./,,'; \ - }; \ - RELATIVE=$$(relative $(DESTDIR)$(bindir) $(DESTDIR)$(SDK_BIN_DIR)); \ - ln -sf $$RELATIVE/`echo gij | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ -Index: b/src/libjava/Makefile.in -=================================================================== ---- a/src/libjava/Makefile.in -+++ b/src/libjava/Makefile.in -@@ -12552,7 +12552,7 @@ install-data-local: - @CREATE_JAVA_HOME_TRUE@ $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS) - @CREATE_JAVA_HOME_TRUE@ relative() { \ - @CREATE_JAVA_HOME_TRUE@ $(PERL) -e 'use File::Spec; \ --@CREATE_JAVA_HOME_TRUE@ print File::Spec->abs2rel($$ARGV[0], $$ARGV[1])' $$1 $$2; \ -+@CREATE_JAVA_HOME_TRUE@ print File::Spec->abs2rel($$ARGV[0], $$ARGV[1])' $$1 $$2 | sed -r 's,(bin|lib)[^/]*/\.\./,,'; \ - @CREATE_JAVA_HOME_TRUE@ }; \ - @CREATE_JAVA_HOME_TRUE@ RELATIVE=$$(relative $(DESTDIR)$(bindir) $(DESTDIR)$(SDK_BIN_DIR)); \ - @CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/`echo gij | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ |