[gentoo-commits] gentoo-x86 commit in sys-devel/llvm/files: llvm-3.4-gentoo-install.patch llvm-3.3-gentoo-install.patch

[gentoo-commits] gentoo-x86 commit in sys-devel/llvm/files: llvm-3.4-gentoo-install.patch llvm-3.3-gentoo-install.patch

[Michal Gorny (mgorny)]

mgorny      13/07/30 14:04:13

  Modified:             llvm-3.4-gentoo-install.patch
                        llvm-3.3-gentoo-install.patch
  Log:
  Revert the RPATH changes and LD_LIBRARY_PATH hack as it resulted in system clang using build tree libraries, bug #478348. Instead, alter the RPATH after installing the libs. Fix installing libLTO and libprofile_rt.
  
  (Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

Revision  Changes    Path
1.2                  sys-devel/llvm/files/llvm-3.4-gentoo-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch?r1=1.1&r2=1.2

Index: llvm-3.4-gentoo-install.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- llvm-3.4-gentoo-install.patch	21 Jul 2013 10:00:50 -0000	1.1
+++ llvm-3.4-gentoo-install.patch	30 Jul 2013 14:04:13 -0000	1.2
@@ -44,25 +44,17 @@
    endif
    endif
    endif
-@@ -605,7 +605,6 @@ endif
- ifdef SHARED_LIBRARY
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
- ifneq ($(HOST_OS),Darwin)
--  LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
- endif
- endif
- endif
 @@ -643,11 +642,11 @@ endif
  ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
    ifneq ($(HOST_OS), Darwin)
      ifdef TOOLNAME
 -      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag)
-+      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag)
++      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag)
      endif
    else
      ifneq ($(DARWIN_MAJVERS),4)
 -      LD.Flags += $(RPATH) -Wl,@executable_path/../lib
-+      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
++      LD.Flags += $(RPATH) -Wl,@executable_path/../lib $(RPATH) -Wl,'$(PROJ_libdir)'
      endif
      ifeq ($(RC_XBS),YES)
        TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)



1.2                  sys-devel/llvm/files/llvm-3.3-gentoo-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch?r1=1.1&r2=1.2

Index: llvm-3.3-gentoo-install.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- llvm-3.3-gentoo-install.patch	21 Jul 2013 10:00:50 -0000	1.1
+++ llvm-3.3-gentoo-install.patch	30 Jul 2013 14:04:13 -0000	1.2
@@ -44,20 +44,12 @@
    endif
    endif
  
-@@ -601,7 +601,6 @@ endif
- ifdef SHARED_LIBRARY
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
- ifneq ($(HOST_OS),Darwin)
--  LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
- endif
- endif
- endif
 @@ -639,7 +638,7 @@ endif
  ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
    ifneq ($(HOST_OS), Darwin)
      ifdef TOOLNAME
 -      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
-+      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
++      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)'
        ifdef EXAMPLE_TOOL
          LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
        else
@@ -66,7 +58,7 @@
  else
    ifneq ($(DARWIN_MAJVERS),4)
 -    LD.Flags += $(RPATH) -Wl,@executable_path/../lib
-+    LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
++    LD.Flags += $(RPATH) -Wl,@executable_path/../lib -Wl,'$(PROJ_libdir)'
    endif
    ifeq ($(RC_XBS),YES)
      TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)