- cleaned up libdir suffix patching

diff --git a/llvm-config.patch b/llvm-config.patch
index 1bd933417d6dee37d2e93af91cd9bb6dfb03bff6..35812f3713b1d5f269ee35f63ad0bb2b7540007d 100644 (file)
--- a/llvm-config.patch
+++ b/llvm-config.patch
@@ -9,8 +9,8 @@
 +eval LLVM_INFODIR="${datadir}/info";
 +eval LLVM_MANDIR="${datadir}/man";
 +eval LLVM_LIBDIR="${libdir}";
-+eval LLVM_LIBDIR_SUFFIX="`echo ${libdir} | sed 's,.*/lib(.*)(/.*|$),\1,'`";
-+eval CLANG_LIBDIR_SUFFIX="`echo ${libdir} | sed 's,.*/lib(.*)(/.*|$),\1,'`";
++eval LLVM_LIBDIR_SUFFIX="`echo ${libdir} | sed 's,.*/lib\(.*\)\(/.*\|$\),\1,'`";
++eval CLANG_LIBDIR_SUFFIX="`echo ${libdir} | sed 's,.*/lib\(.*\)\(/.*\|$\),\1,'`";
  LLVM_CONFIGTIME=`date`
  AC_SUBST(LLVM_PREFIX)
  AC_SUBST(LLVM_BINDIR)
@@ -91,8 +91,8 @@
 -  SmallString<128> Res(TC.getDriver().ResourceDir);
 -  const llvm::Triple &Triple = TC.getTriple();
 -  // TC.getOS() yield "freebsd10.0" whereas "freebsd" is expected.
--  StringRef OSLibName = (Triple.getOS() == llvm::Triple::FreeBSD) ?
--    "freebsd" : TC.getOS();
+-  StringRef OSLibName =
+-      (Triple.getOS() == llvm::Triple::FreeBSD) ? "freebsd" : TC.getOS();
 -  llvm::sys::path::append(Res, "lib", OSLibName);
 +  SmallString<128> Res(LLVM_LIBDIR);
    return Res;

diff --git a/llvm.spec b/llvm.spec
index 138e0840cf625c1e4459d2cdcc191f924b075e36..2cf02cdc58fc3a6acf473e392d74adf43c12e61a 100644 (file)
--- a/llvm.spec
+++ b/llvm.spec
@@ -469,13 +469,7 @@ cd ../..
 #
 # bash specific 'test a < b'
 cd obj
-CPPFLAGS="%{rpmcppflags} -D_FILE_OFFSET_BITS=64 \
-%ifarch %{x8664}
--DLLVM_LIBDIR_SUFFIX=64"
-%endif
-%ifarch x32
--DLLVM_LIBDIR_SUFFIX=x32"
-%endif
+CPPFLAGS="%{rpmcppflags} -D_FILE_OFFSET_BITS=64"
 
 bash ../%configure \
        --datadir=%{_datadir}/%{name}-%{version} \