[llvm] llvm-config: fix to report correct libdir

Dave Airlie airlied at fedoraproject.org
Sun Jun 3 14:49:22 UTC 2012


commit 9e49469714e764987b872f374f4f85b5a056eb4a
Author: Dave Airlie <airlied at redhat.com>
Date:   Sun Jun 3 15:42:52 2012 +0100

    llvm-config: fix to report correct libdir
    
    I noticed that llvm-config is now a c++ app, and it does the wrong
    thing completely on Fedora, so hard code the Fedora packaging libdir
    in it.

 llvm.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/llvm.spec b/llvm.spec
index 94377d9..c056d9d 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -307,6 +307,10 @@ sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' \
 # configure does not properly specify libdir
 sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/%{name}|g' Makefile.config
 
+# FIXME upstream need to fix this
+# llvm-config.cpp hardcodes lib in it
+sed -i 's|ActiveLibDir = ActivePrefix + "/lib"|ActiveLibDir = ActivePrefix + "/%{_lib}/%{name}"|g' tools/llvm-config/llvm-config.cpp
+
 make %{_smp_mflags} REQUIRES_RTTI=1 VERBOSE=1 \
 %ifarch ppc
   OPTIMIZE_OPTION="%{optflags} -fno-var-tracking-assignments -UPPC"


More information about the scm-commits mailing list