mgorny 14/12/31 10:37:37 Added: llvm-3.6-gentoo-install.patch Log: Update Gentoo patch for -9999, bug #534080. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.1 sys-devel/llvm/files/llvm-3.6-gentoo-install.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch?rev=1.1&content-type=text/plain Index: llvm-3.6-gentoo-install.patch =================================================================== >From bb016afeba4d9e886e776565a508634a261111a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> Date: Wed, 31 Dec 2014 11:26:12 +0100 Subject: [PATCH] gentoo build fixes --- Makefile.config.in | 6 +++--- Makefile.rules | 2 +- tools/llvm-config/BuildVariables.inc.in | 1 + tools/llvm-config/Makefile | 2 ++ tools/llvm-config/llvm-config.cpp | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index d34a2d5..a26cd08 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -99,10 +99,10 @@ PROJ_internal_prefix := $(prefix) endif PROJ_bindir := $(PROJ_prefix)/bin -PROJ_libdir := $(PROJ_prefix)/lib +PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR) PROJ_datadir := $(PROJ_prefix)/share -PROJ_docsdir := $(PROJ_prefix)/docs/llvm -PROJ_etcdir := $(PROJ_prefix)/etc/llvm +PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@ +PROJ_etcdir := @EPREFIX@/etc/llvm PROJ_includedir := $(PROJ_prefix)/include PROJ_infodir := $(PROJ_prefix)/info PROJ_mandir := $(PROJ_prefix)/share/man diff --git a/Makefile.rules b/Makefile.rules index c8c971f..d1258b1 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -283,7 +283,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) BuildMode := Release # Don't use -fomit-frame-pointer on Darwin or FreeBSD. ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD)) - OmitFramePointer := -fomit-frame-pointer + OmitFramePointer := endif CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in index 3f51f49..513ea89 100644 --- a/tools/llvm-config/BuildVariables.inc.in +++ b/tools/llvm-config/BuildVariables.inc.in @@ -26,3 +26,4 @@ #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" +#define LLVM_LIBDIR "@LLVM_LIBDIR@" diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile index 1ff8b6f..5d73c6e 100644 --- a/tools/llvm-config/Makefile +++ b/tools/llvm-config/Makefile @@ -65,6 +65,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir >> temp.sed $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ >> temp.sed + $(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \ + >> temp.sed $(Verb) $(SED) -f temp.sed < $< > $@ $(Verb) $(RM) temp.sed diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp index 224035a..57180ac 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp @@ -265,7 +265,7 @@ int main(int argc, char **argv) { ActivePrefix = CurrentExecPrefix; ActiveIncludeDir = ActivePrefix + "/include"; ActiveBinDir = ActivePrefix + "/bin"; - ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; + ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR; ActiveIncludeOption = "-I" + ActiveIncludeDir; } -- 2.2.1
