diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-08-06 22:02:44 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-08-06 22:02:44 +0000 |
| commit | 6ccb383ac7b2dd05d6f3f5212b8d272f152328be (patch) | |
| tree | 0d0917f0f14a4b544092d688fefea6cd69caf03a /sys-devel | |
| parent | fix build with ffmpeg-2, bug #478080 (diff) | |
| download | gentoo-2-6ccb383ac7b2dd05d6f3f5212b8d272f152328be.tar.gz gentoo-2-6ccb383ac7b2dd05d6f3f5212b8d272f152328be.tar.bz2 gentoo-2-6ccb383ac7b2dd05d6f3f5212b8d272f152328be.zip | |
Update the gentoo-install.patch to match current git.
(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/llvm/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/llvm/files/llvm-3.4-gentoo-install.patch | 16 |
2 files changed, 13 insertions, 9 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog index 9314771ddf81..7124379f24c3 100644 --- a/sys-devel/llvm/ChangeLog +++ b/sys-devel/llvm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.129 2013/08/02 12:25:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.130 2013/08/06 22:02:44 mgorny Exp $ + + 06 Aug 2013; Michał Górny <mgorny@gentoo.org> + files/llvm-3.4-gentoo-install.patch: + Update the gentoo-install.patch to match current git. 02 Aug 2013; Michał Górny <mgorny@gentoo.org> llvm-3.3-r1.ebuild, llvm-9999.ebuild: diff --git a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch index 93260923678c..6188a0fc7eab 100644 --- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch +++ b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch @@ -1,17 +1,17 @@ -From be2ee7ba7ab4c1aec86d3d9e49e1be241afd8abd Mon Sep 17 00:00:00 2001 +From 912a22be663bc1c0cc20b9cde9c9a35e9f48275c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl> Date: Fri, 19 Jul 2013 10:10:52 +0200 Subject: [PATCH 1/2] gentoo install fixes --- Makefile.config.in | 6 +++--- - Makefile.rules | 7 +++---- + Makefile.rules | 6 +++--- tools/gold/Makefile | 2 +- tools/llvm-config/BuildVariables.inc.in | 2 ++ tools/llvm-config/Makefile | 4 ++++ tools/llvm-config/llvm-config.cpp | 5 +++-- utils/FileCheck/Makefile | 2 +- - 7 files changed, 17 insertions(+), 11 deletions(-) + 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index dcca45f..e75ae2e 100644 @@ -32,7 +32,7 @@ index dcca45f..e75ae2e 100644 PROJ_infodir := $(PROJ_prefix)/info PROJ_mandir := $(PROJ_prefix)/share/man diff --git a/Makefile.rules b/Makefile.rules -index 1bc78f1..60cd228 100644 +index 32b1ebc..5bb0342 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -277,7 +277,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) @@ -44,12 +44,12 @@ index 1bc78f1..60cd228 100644 endif endif endif -@@ -643,11 +642,11 @@ endif - ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) +@@ -619,11 +619,11 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) + endif ifneq ($(HOST_OS), Darwin) ifdef TOOLNAME -- LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag) -+ LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag) +- LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' ++ LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' endif else ifneq ($(DARWIN_MAJVERS),4) |