- config patch breaks build and the only thing needs fixing is

  llvm-config and it's doable with sed
- rel 2

diff --git a/llvm-config.patch b/llvm-config.patch
deleted file mode 100644 (file)
index e0777fa..0000000
--- a/llvm-config.patch
+++ /dev/null
@@ -1,201 +0,0 @@
---- llvm-3.4.1.src/autoconf/configure.ac.orig  2014-05-21 18:37:05.321379360 +0200
-+++ llvm-3.4.1.src/autoconf/configure.ac       2014-05-21 18:40:49.568041358 +0200
-@@ -1813,8 +1813,11 @@
- eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
- eval LLVM_ETCDIR="${prefix}/etc/llvm";
- eval LLVM_INCLUDEDIR="${prefix}/include";
--eval LLVM_INFODIR="${prefix}/info";
--eval LLVM_MANDIR="${prefix}/man";
-+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,'`";
- LLVM_CONFIGTIME=`date`
- AC_SUBST(LLVM_PREFIX)
- AC_SUBST(LLVM_BINDIR)
-@@ -1824,6 +1825,9 @@
- AC_SUBST(LLVM_INCLUDEDIR)
- AC_SUBST(LLVM_INFODIR)
- AC_SUBST(LLVM_MANDIR)
-+AC_SUBST(LLVM_LIBDIR)
-+AC_SUBST(LLVM_LIBDIR_SUFFIX)
-+AC_SUBST(CLANG_LIBDIR_SUFFIX)
- AC_SUBST(LLVM_CONFIGTIME)
- 
- dnl Disable embedding timestamps in the build directory, with ENABLE_TIMESTAMPS.
-@@ -1851,6 +1851,12 @@
-                    [Installation directory for .info files])
- AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_MANDIR",
-                    [Installation directory for man pages])
-+AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR",
-+                   [Installation directory for libraries])
-+AC_DEFINE_UNQUOTED(LLVM_LIBDIR_SUFFIX, "$LLVM_LIBDIR_SUFFIX",
-+                   [Installation directory for libraries])
-+AC_DEFINE_UNQUOTED(CLANG_LIBDIR_SUFFIX, "$CLANG_LIBDIR_SUFFIX",
-+                   [Installation directory for libraries])
- AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME",
-                    [Time at which LLVM was configured])
- AC_DEFINE_UNQUOTED(LLVM_HOST_TRIPLE, "$host",
-@@ -2029,10 +2029,6 @@
-   clang_src_root="$srcdir/tools/clang"
- fi
- if test -f ${clang_src_root}/README.txt; then
--  dnl Clang supports build systems which use the multilib libdir suffix.
--  dnl The autoconf system doesn't support this so stub out that variable.
--  AC_DEFINE_UNQUOTED(CLANG_LIBDIR_SUFFIX,"",
--                     [Multilib suffix for libdir.])
- 
-   dnl Use variables to stay under 80 columns.
-   configh="include/clang/Config/config.h"
---- llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp.orig  2014-08-27 22:07:31.000000000 +0200
-+++ llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp       2014-10-01 20:56:40.312848502 +0200
-@@ -2999,19 +2999,6 @@
-     return Triple.isArch32Bit() ? "lib" : "lib64";
-   }
- 
--  // It happens that only x86 and PPC use the 'lib32' variant of oslibdir, and
--  // using that variant while targeting other architectures causes problems
--  // because the libraries are laid out in shared system roots that can't cope
--  // with a 'lib32' library search path being considered. So we only enable
--  // them when we know we may need it.
--  //
--  // FIXME: This is a bit of a hack. We should really unify this code for
--  // reasoning about oslibdir spellings with the lib dir spellings in the
--  // GCCInstallationDetector, but that is a more significant refactoring.
--  if (Triple.getArch() == llvm::Triple::x86 ||
--      Triple.getArch() == llvm::Triple::ppc)
--    return "lib32";
--
-   if (Triple.getArch() == llvm::Triple::x86_64 &&
-       Triple.getEnvironment() == llvm::Triple::GNUX32)
-     return "libx32";
-@@ -3160,7 +3147,7 @@
-   // Try walking via the GCC triple path in case of biarch or multiarch GCC
-   // installations with strange symlinks.
-   if (GCCInstallation.isValid()) {
--    addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
-+    addPathIfExists(SysRoot + "/usr/" + OSLibDir + "/" + GCCInstallation.getTriple().str() +
-                     "/../../" + OSLibDir, Paths);
- 
-     // Add the 'other' biarch variant path
-@@ -3190,10 +3177,10 @@
-   // FIXME: It's not clear whether we should use the driver's installed
-   // directory ('Dir' below) or the ResourceDir.
-   if (StringRef(D.Dir).startswith(SysRoot))
--    addPathIfExists(D.Dir + "/../lib", Paths);
-+    addPathIfExists(D.Dir + "/../" + OSLibDir, Paths);
- 
--  addPathIfExists(SysRoot + "/lib", Paths);
--  addPathIfExists(SysRoot + "/usr/lib", Paths);
-+  addPathIfExists(SysRoot + "/" + OSLibDir, Paths);
-+  addPathIfExists(SysRoot + "/usr/" + OSLibDir, Paths);
- }
- 
- bool Linux::HasNativeLLVMSupport() const {
---- llvm-3.5.0.src/tools/clang/lib/Driver/Tools.cpp.orig       2014-08-07 06:51:51.000000000 +0200
-+++ llvm-3.5.0.src/tools/clang/lib/Driver/Tools.cpp    2014-10-01 21:04:32.002828710 +0200
-@@ -26,6 +26,7 @@
- #include "llvm/ADT/StringExtras.h"
- #include "llvm/ADT/StringSwitch.h"
- #include "llvm/ADT/Twine.h"
-+#include "llvm/Config/config.h"
- #include "llvm/Option/Arg.h"
- #include "llvm/Option/ArgList.h"
- #include "llvm/Option/Option.h"
-@@ -2037,12 +2038,7 @@
- 
- static SmallString<128> getCompilerRTLibDir(const ToolChain &TC) {
-   // The runtimes are located in the OS-specific resource directory.
--  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();
--  llvm::sys::path::append(Res, "lib", OSLibName);
-+  SmallString<128> Res(LLVM_LIBDIR);
-   return Res;
- }
- 
-@@ -5899,9 +5895,9 @@
-                                   const ArgList &Args,
-                                   const char *LinkingOutput) const {
-   // FIXME: Find a real GCC, don't hard-code versions here
--  std::string GCCLibPath = "/usr/gcc/4.5/lib/gcc/";
-+  std::string GCCLibPath = LLVM_LIBDIR "/gcc/";
-   const llvm::Triple &T = getToolChain().getTriple();
--  std::string LibPath = "/usr/lib/";
-+  std::string LibPath = LLVM_LIBDIR "/";
-   llvm::Triple::ArchType Arch = T.getArch();
-   switch (Arch) {
-   case llvm::Triple::x86:
---- llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile.orig       2014-05-22 23:13:30.000000000 +0200
-+++ llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile    2014-10-18 22:10:17.008329250 +0200
-@@ -20,7 +20,7 @@
-       $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
- 
- ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
--PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
-+PROJ_resources := $(DESTDIR)$(PROJ_libdir)/clang/$(CLANG_VERSION)
- 
- ResourceLibDir := $(ResourceDir)/lib
- ResourceIncludeDir := $(ResourceDir)/include
---- llvm-3.6.0.src/cmake/modules/Makefile~     2015-01-05 21:24:36.000000000 +0000
-+++ llvm-3.6.0.src/cmake/modules/Makefile      2015-03-01 13:56:38.156631157 +0000
-@@ -73,7 +73,7 @@
-         -e 's/@LLVM_ENABLE_PIC@/'"$(ENABLE_PIC)"'/' \
-         -e 's/@LLVM_ON_UNIX@/'"$(LLVM_ON_UNIX)"'/' \
-         -e 's/@LLVM_ON_WIN32@/'"$(LLVM_ON_WIN32)"'/' \
--        -e 's/@LLVM_LIBDIR_SUFFIX@//' \
-+        -e 's/@LLVM_LIBDIR_SUFFIX@/$(LLVM_LIBDIR_SUFFIX)/' \
-         -e 's/@LLVM_CONFIG_INCLUDE_DIRS@/'"$(subst /,\/,$(PROJ_includedir))"'/' \
-         -e 's/@LLVM_CONFIG_LIBRARY_DIRS@/'"$(subst /,\/,$(PROJ_libdir))"'/' \
-         -e 's/@LLVM_CONFIG_CMAKE_DIR@/'"$(subst /,\/,$(PROJ_cmake))"'/' \
---- llvm-3.6.0.src/tools/llvm-config/Makefile~ 2014-12-29 11:16:25.000000000 +0000
-+++ llvm-3.6.0.src/tools/llvm-config/Makefile  2015-03-01 13:57:58.293294997 +0000
-@@ -59,7 +59,7 @@
-         >> temp.sed
-       $(Verb) $(ECHO) 's/@LLVM_BUILDMODE@/$(subst /,\/,$(BuildMode))/' \
-         >> temp.sed
--      $(Verb) $(ECHO) 's/@LLVM_LIBDIR_SUFFIX@//' \
-+      $(Verb) $(ECHO) 's/@LLVM_LIBDIR_SUFFIX@/$(subst /,\/,$(LLVM_LIBDIR_SUFFIX))/' \
-         >> temp.sed
-       $(Verb) $(ECHO) 's/@LLVM_SYSTEM_LIBS@/$(subst /,\/,$(LLVM_SYSTEM_LIBS))/' \
-         >> temp.sed
---- llvm-3.6.0.src/Makefile.config.in~ 2015-03-01 13:59:58.000000000 +0000
-+++ llvm-3.6.0.src/Makefile.config.in  2015-03-01 14:18:47.196584274 +0000
-@@ -123,6 +123,8 @@
- ARCH=@ARCH@
- TARGET_NATIVE_ARCH := $(ARCH)
- LLVM_NATIVE_ARCH := @LLVM_NATIVE_ARCH@
-+LLVM_LIBDIR_SUFFIX := @LLVM_LIBDIR_SUFFIX@
-+CLANG_LIBDIR_SUFFIX := @LLVM_LIBDIR_SUFFIX@
- 
- # Indicates, whether we're cross-compiling LLVM or not
- LLVM_CROSS_COMPILING=@LLVM_CROSS_COMPILING@
---- llvm-3.6.0.src/include/llvm/Config/config.h.in~    2015-03-01 15:17:14.000000000 +0000
-+++ llvm-3.6.0.src/include/llvm/Config/config.h.in     2015-03-01 15:54:08.119715796 +0000
-@@ -1,7 +1,7 @@
- /* include/llvm/Config/config.h.in.  Generated from autoconf/configure.ac by autoheader.  */
- 
--#ifndef CONFIG_H
--#define CONFIG_H
-+#ifndef LLVM_CONFIG_H
-+#define LLVM_CONFIG_H
- 
- /* Bug report URL. */
- #undef BUG_REPORT_URL
---- llvm-3.6.0.src/tools/clang/include/clang/Config/config.h.in~       2014-12-29 12:09:08.000000000 +0000
-+++ llvm-3.6.0.src/tools/clang/include/clang/Config/config.h.in        2015-03-01 15:55:28.736379620 +0000
-@@ -1,9 +1,9 @@
- /* This generated file is for internal use. Do not include it from headers. */
- 
--#ifdef CONFIG_H
-+#ifdef CLANG_CONFIG_H
- #error config.h can only be included once
- #else
--#define CONFIG_H
-+#define CLANG_CONFIG_H
- 
- /* Bug report URL. */
- #undef BUG_REPORT_URL

diff --git a/llvm.spec b/llvm.spec
index 68968bd9490d34da74d03aa16a3b0ddc9e4d4f87..0b8c24cc90e09162e4cbec23379bab348671fad5 100644 (file)
--- a/llvm.spec
+++ b/llvm.spec
@@ -17,7 +17,7 @@ Summary:      The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
 Summary(pl.UTF-8):     Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego)
 Name:          llvm
 Version:       3.6.2
-Release:       1.1
+Release:       2
 License:       University of Illinois/NCSA Open Source License
 Group:         Development/Languages
 #Source0Download: http://llvm.org/releases/download.html
@@ -35,7 +35,6 @@ Source5:      http://llvm.org/releases/%{version}/clang-tools-extra-%{version}.src.ta
 # Source5-md5: 3ebc1dc41659fcec3db1b47d81575e06
 Source6:       http://llvm.org/releases/%{version}/lld-%{version}.src.tar.xz
 # Source6-md5: 7143cc4fa88851a9f9b9a03621fbb387
-Patch0:                %{name}-config.patch
 # Data files should be installed with timestamps preserved
 Patch1:                %{name}-2.6-timestamp.patch
 Patch2:                %{name}-pld.patch
@@ -422,7 +421,6 @@ mv cfe-%{version}.src tools/clang
 mv clang-tools-extra-%{version}.src tools/clang/tools/extra
 mv lld-%{version}.src tools/lld
 
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -443,6 +441,13 @@ mv lld-%{version}.src tools/lld
        tools/clang/runtime/compiler-rt/Makefile
 %{__sed} -i 's|"lib"|"%{_lib}"|' tools/clang/lib/Driver/Driver.cpp
 
+%ifarch x32
+%{__sed} -i 's|@LLVM_LIBDIR_SUFFIX@|x32|' tools/llvm-config/BuildVariables.inc.in
+%endif
+%ifarch %{x8664}
+%{__sed} -i 's|@LLVM_LIBDIR_SUFFIX@|64|' tools/llvm-config/BuildVariables.inc.in
+%endif
+
 grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{
        s,^#!.*bin/env python,#!%{__python},
        s,^#!.*bin/env perl,#!%{__perl},