← Back to branch summary

~ubuntu-branches/debian/sid/gcc-4.8/sid

« back to all changes in this revision

Viewing changes to .svn/pristine/5f/5f10700ae2163004e72a8f0dbf5f347a881b9bed.svn-base

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-12-19 19:48:34 UTC
  • Revision ID: package-import@ubuntu.com-20141219194834-4dz1q7rrn5pad823
Tags: 4.8.4-1
* GCC 4.8.4 release.
  - Fix PR target/61407 (darwin), PR middle-end/58624 (ice),
    PR sanitizer/64265 (wrong code).
* Require recent binutils to pass go test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.svn/pristine/5f/5f10700ae2163004e72a8f0dbf5f347a881b9bed.svn-base
 
1
# DP: Remove unneed '..' elements from symlinks in JAVA_HOME
 
2
 
 
3
Index: b/src/libjava/Makefile.am
 
4
===================================================================
 
5
--- a/src/libjava/Makefile.am
 
6
+++ b/src/libjava/Makefile.am
 
7
@@ -828,7 +828,7 @@
 
8
        $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)
 
9
        relative() { \
 
10
          $(PERL) -e 'use File::Spec; \
 
11
-           print File::Spec->abs2rel($$ARGV[0], $$ARGV[1])' $$1 $$2; \
 
12
+           print File::Spec->abs2rel($$ARGV[0], $$ARGV[1])' $$1 $$2 | sed -r 's,(bin|lib)[^/]*/\.\./,,'; \
 
13
        }; \
 
14
        RELATIVE=$$(relative $(DESTDIR)$(bindir) $(DESTDIR)$(SDK_BIN_DIR)); \
 
15
        ln -sf $$RELATIVE/`echo gij | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 
16
Index: b/src/libjava/Makefile.in
 
17
===================================================================
 
18
--- a/src/libjava/Makefile.in
 
19
+++ b/src/libjava/Makefile.in
 
20
@@ -12475,7 +12475,7 @@
 
21
 @CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)
 
22
 @CREATE_JAVA_HOME_TRUE@        relative() { \
 
23
 @CREATE_JAVA_HOME_TRUE@          $(PERL) -e 'use File::Spec; \
 
24
-@CREATE_JAVA_HOME_TRUE@            print File::Spec->abs2rel($$ARGV[0], $$ARGV[1])' $$1 $$2; \
 
25
+@CREATE_JAVA_HOME_TRUE@            print File::Spec->abs2rel($$ARGV[0], $$ARGV[1])' $$1 $$2 | sed -r 's,(bin|lib)[^/]*/\.\./,,'; \
 
26
 @CREATE_JAVA_HOME_TRUE@        }; \
 
27
 @CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(bindir) $(DESTDIR)$(SDK_BIN_DIR)); \
 
28
 @CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gij | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \