From 57df0cc54a656563c6a1d44f3dce111f9563601c Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 11 Aug 2010 17:46:43 -0400 Subject: [PATCH 01/13] recompiling .py files against Python 2.7 (rhbz#623332) --- llvm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index 604ad36..57341f2 100644 --- a/llvm.spec +++ b/llvm.spec @@ -12,7 +12,7 @@ Name: llvm Version: 2.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Low Level Virtual Machine Group: Development/Languages @@ -388,6 +388,9 @@ rm -rf %{buildroot} %changelog +* Wed Aug 11 2010 David Malcolm - 2.7-7 +- recompiling .py files against Python 2.7 (rhbz#623332) + * Sat Jul 17 2010 Dan Horák - 2.7-6 - conditionalize ocaml support From d492cae130c0a0c764246163d009225488574ab0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 22:56:01 -0700 Subject: [PATCH 02/13] - Rebuilt for gcc bug 634757 --- llvm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index fd445fd..4129fb2 100644 --- a/llvm.spec +++ b/llvm.spec @@ -12,7 +12,7 @@ Name: llvm Version: 2.7 -Release: 9%{?dist} +Release: 9%{?dist}.1 Summary: The Low Level Virtual Machine Group: Development/Languages @@ -381,6 +381,9 @@ find examples -name 'Makefile' | xargs -0r rm -f %changelog +* Wed Sep 29 2010 jkeating - 2.7-9.1 +- Rebuilt for gcc bug 634757 + * Mon Sep 20 2010 Michel Salim - 2.7-9 - Dynamically determine C++ include path at compile time (# 630474) - Remove unneeded BuildRoot field and clean section From ae1ead319b7a2c8652f952e401d7b82c970631f4 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 14 Oct 2010 23:26:34 +0200 Subject: [PATCH 03/13] - Add correct C include directory at compile time (# 641500) - Upstream patch so -g flag is not passed to assembler (# 605266) --- clang-2.7-nodebug.patch | 19 +++++++++++++++++++ llvm.spec | 11 ++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 clang-2.7-nodebug.patch diff --git a/clang-2.7-nodebug.patch b/clang-2.7-nodebug.patch new file mode 100644 index 0000000..4bb2f94 --- /dev/null +++ b/clang-2.7-nodebug.patch @@ -0,0 +1,19 @@ +Upstream revision 11011, fixing bug 6218: +http://llvm.org/bugs/show_bug.cgi?id=6218 + +--- cfe/trunk/lib/Driver/Tools.cpp 2010/08/03 15:07:17 110110 ++++ cfe/trunk/lib/Driver/Tools.cpp 2010/08/03 16:14:14 110111 +@@ -1600,6 +1600,11 @@ + it = Args.begin(), ie = Args.end(); it != ie; ++it) { + Arg *A = *it; + if (A->getOption().hasForwardToGCC()) { ++ // Don't forward any -g arguments to assembly steps. ++ if (isa(JA) && ++ A->getOption().matches(options::OPT_g_Group)) ++ continue; ++ + // It is unfortunate that we have to claim here, as this means + // we will basically never report anything interesting for + // platforms using a generic gcc, even if we are just using gcc + + diff --git a/llvm.spec b/llvm.spec index 4129fb2..97d7231 100644 --- a/llvm.spec +++ b/llvm.spec @@ -12,7 +12,7 @@ Name: llvm Version: 2.7 -Release: 9%{?dist}.1 +Release: 10%{?dist} Summary: The Low Level Virtual Machine Group: Development/Languages @@ -22,6 +22,7 @@ Source0: http://llvm.org/releases/%{version}/llvm-%{version}.tgz Source1: http://llvm.org/releases/%{version}/clang-%{version}.tgz # Data files should be installed with timestamps preserved Patch0: llvm-2.6-timestamp.patch +Patch1: clang-2.7-nodebug.patch BuildRequires: bison BuildRequires: chrpath @@ -191,6 +192,9 @@ HTML documentation for LLVM's OCaml binding. mv clang-%{version} tools/clang %patch0 -p1 -b .timestamp +pushd tools/clang +%patch1 -p2 -b .nodebug +popd # Encoding fix (cd tools/clang/docs && \ @@ -212,6 +216,7 @@ mv clang-%{version} tools/clang --enable-debug-runtime \ --enable-jit \ --enable-shared \ + --with-c-include-dirs=$(echo /usr/lib/gcc/*/*/include) \ --with-cxx-include-root=$(echo /usr/include/c++/*) \ --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os} @@ -381,6 +386,10 @@ find examples -name 'Makefile' | xargs -0r rm -f %changelog +* Thu Oct 14 2010 Michel Salim - 2.7-10 +- Add correct C include directory at compile time (# 641500) +- Upstream patch so -g flag is not passed to assembler (# 605266) + * Wed Sep 29 2010 jkeating - 2.7-9.1 - Rebuilt for gcc bug 634757 From b3327249f3dda539b44a535dcaea83ef2a69e752 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 14 Oct 2010 23:58:09 +0200 Subject: [PATCH 04/13] Re-add default include directory --- llvm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index 97d7231..e344150 100644 --- a/llvm.spec +++ b/llvm.spec @@ -216,7 +216,7 @@ popd --enable-debug-runtime \ --enable-jit \ --enable-shared \ - --with-c-include-dirs=$(echo /usr/lib/gcc/*/*/include) \ + --with-c-include-dirs=/usr/include:$(echo /usr/lib/gcc/*/*/include) \ --with-cxx-include-root=$(echo /usr/include/c++/*) \ --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os} From 63bfe803a91921f392a802c701a4a1434d2c9ff9 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 15 Oct 2010 00:01:05 +0200 Subject: [PATCH 05/13] macro-ify include overrides --- llvm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm.spec b/llvm.spec index e344150..ed6b4f3 100644 --- a/llvm.spec +++ b/llvm.spec @@ -216,8 +216,8 @@ popd --enable-debug-runtime \ --enable-jit \ --enable-shared \ - --with-c-include-dirs=/usr/include:$(echo /usr/lib/gcc/*/*/include) \ - --with-cxx-include-root=$(echo /usr/include/c++/*) \ + --with-c-include-dirs=%{_includedir}:$(echo %{_prefix}/lib/gcc/*/*/include) \ + --with-cxx-include-root=$(echo %{_includedir}/c++/*) \ --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os} # FIXME file this From 2be1863ab3a7c22390955a68a6226de803d45918 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 15 Oct 2010 00:05:07 +0200 Subject: [PATCH 06/13] Bump release number for rebuild --- llvm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index ed6b4f3..f0427fd 100644 --- a/llvm.spec +++ b/llvm.spec @@ -12,7 +12,7 @@ Name: llvm Version: 2.7 -Release: 10%{?dist} +Release: 11%{?dist} Summary: The Low Level Virtual Machine Group: Development/Languages @@ -386,6 +386,9 @@ find examples -name 'Makefile' | xargs -0r rm -f %changelog +* Fri Oct 15 2010 Michel Salim - 2.7-11 +- Re-add omitted %%{_includedir} + * Thu Oct 14 2010 Michel Salim - 2.7-10 - Add correct C include directory at compile time (# 641500) - Upstream patch so -g flag is not passed to assembler (# 605266) From 67f86fc6128b089317215748f822ab70d79b8e8d Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 27 Nov 2010 17:39:46 +0100 Subject: [PATCH 07/13] remove obsoleted patch --- clang-2.7-nodebug.patch | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 clang-2.7-nodebug.patch diff --git a/clang-2.7-nodebug.patch b/clang-2.7-nodebug.patch deleted file mode 100644 index 4bb2f94..0000000 --- a/clang-2.7-nodebug.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream revision 11011, fixing bug 6218: -http://llvm.org/bugs/show_bug.cgi?id=6218 - ---- cfe/trunk/lib/Driver/Tools.cpp 2010/08/03 15:07:17 110110 -+++ cfe/trunk/lib/Driver/Tools.cpp 2010/08/03 16:14:14 110111 -@@ -1600,6 +1600,11 @@ - it = Args.begin(), ie = Args.end(); it != ie; ++it) { - Arg *A = *it; - if (A->getOption().hasForwardToGCC()) { -+ // Don't forward any -g arguments to assembly steps. -+ if (isa(JA) && -+ A->getOption().matches(options::OPT_g_Group)) -+ continue; -+ - // It is unfortunate that we have to claim here, as this means - // we will basically never report anything interesting for - // platforms using a generic gcc, even if we are just using gcc - - From 4bd5997c88b2dc36b0d9022df1d46f52ee657b46 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 10 Jan 2011 17:16:53 +0000 Subject: [PATCH 08/13] Bump and rebuild. --- llvm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index a023bfd..8f5155c 100644 --- a/llvm.spec +++ b/llvm.spec @@ -12,7 +12,7 @@ Name: llvm Version: 2.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Low Level Virtual Machine Group: Development/Languages @@ -394,6 +394,9 @@ find examples -name 'Makefile' | xargs -0r rm -f %changelog +* Mon Jan 10 2011 Richard W.M. Jones - 2.8-6 +- Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12). + * Sat Nov 27 2010 Michel Salim - 2.8-5 - clang now requires gcc-c++ for linking and headers (bug #654560) From 75d0f4e42d7cdfff47ef3a3b534d4e4a3a35b965 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 07:26:30 -0600 Subject: [PATCH 09/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- llvm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index 8f5155c..3535c9c 100644 --- a/llvm.spec +++ b/llvm.spec @@ -12,7 +12,7 @@ Name: llvm Version: 2.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Low Level Virtual Machine Group: Development/Languages @@ -394,6 +394,9 @@ find examples -name 'Makefile' | xargs -0r rm -f %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jan 10 2011 Richard W.M. Jones - 2.8-6 - Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12). From f8523b8fdb3e2f63edcbf63b361f4e23169abcba Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 17 Mar 2011 12:47:48 +0100 Subject: [PATCH 10/13] clang++: also search for platform-specific include files (# 680644) --- llvm.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/llvm.spec b/llvm.spec index 3535c9c..8cc1bf1 100644 --- a/llvm.spec +++ b/llvm.spec @@ -12,7 +12,7 @@ Name: llvm Version: 2.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The Low Level Virtual Machine Group: Development/Languages @@ -225,7 +225,9 @@ popd --with-c-include-dirs=%{_includedir}:$(find %{_prefix}/lib/gcc/*/* \ -maxdepth 0 -type d)/include \ --with-cxx-include-root=$(find %{_includedir}/c++/* -maxdepth 0 -type d) \ - --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os} + --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os} \ + --with-cxx-include-32bit-dir=$(find %{_includedir}/c++/* -maxdepth 0 -type d)/%{_arch}-%{_vendor}-%{_os}/32/bits \ + --with-cxx-include-64bit-dir=$(find %{_includedir}/c++/* -maxdepth 0 -type d)/%{_arch}-%{_vendor}-%{_os}/bits # FIXME file this # configure does not properly specify libdir @@ -394,6 +396,9 @@ find examples -name 'Makefile' | xargs -0r rm -f %changelog +* Thu Mar 17 2011 Michel Salim - 2.8-8 +- clang++: also search for platform-specific include files (# 680644) + * Tue Feb 08 2011 Fedora Release Engineering - 2.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From b32ca652bd0332a0c0bc69d25d53e017c28b91ad Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 17 Mar 2011 13:19:24 +0100 Subject: [PATCH 11/13] Fix 32bit-dir and 64-dir parameters: should be relative, not absolute --- llvm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm.spec b/llvm.spec index 8cc1bf1..ed3398e 100644 --- a/llvm.spec +++ b/llvm.spec @@ -226,8 +226,8 @@ popd -maxdepth 0 -type d)/include \ --with-cxx-include-root=$(find %{_includedir}/c++/* -maxdepth 0 -type d) \ --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os} \ - --with-cxx-include-32bit-dir=$(find %{_includedir}/c++/* -maxdepth 0 -type d)/%{_arch}-%{_vendor}-%{_os}/32/bits \ - --with-cxx-include-64bit-dir=$(find %{_includedir}/c++/* -maxdepth 0 -type d)/%{_arch}-%{_vendor}-%{_os}/bits + --with-cxx-include-32bit-dir=32/bits \ + --with-cxx-include-64bit-dir=bits # FIXME file this # configure does not properly specify libdir From 88425e38fa4f0a91e009f2abf5c1f8a0ef018666 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 17 Mar 2011 13:57:46 +0100 Subject: [PATCH 12/13] Don't include 'bits' in the include path override --- llvm.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/llvm.spec b/llvm.spec index ed3398e..4c70a56 100644 --- a/llvm.spec +++ b/llvm.spec @@ -226,8 +226,7 @@ popd -maxdepth 0 -type d)/include \ --with-cxx-include-root=$(find %{_includedir}/c++/* -maxdepth 0 -type d) \ --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os} \ - --with-cxx-include-32bit-dir=32/bits \ - --with-cxx-include-64bit-dir=bits + --with-cxx-include-32bit-dir=32 # FIXME file this # configure does not properly specify libdir From 1db435d4d684491a4e4686532b5e3d3c7b822bd6 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 17 Mar 2011 14:34:26 +0100 Subject: [PATCH 13/13] clang++: fix platform-specific include dirs (# 680644) --- llvm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/llvm.spec b/llvm.spec index 4c70a56..cb65824 100644 --- a/llvm.spec +++ b/llvm.spec @@ -12,7 +12,7 @@ Name: llvm Version: 2.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: The Low Level Virtual Machine Group: Development/Languages @@ -86,7 +86,7 @@ Summary: A C language family front-end for LLVM License: NCSA Group: Development/Languages # clang requires gcc; clang++ gcc-c++ -Requires: gcc-c++ +Requires: gcc-c++ %description -n clang clang: noun @@ -395,6 +395,9 @@ find examples -name 'Makefile' | xargs -0r rm -f %changelog +* Thu Mar 17 2011 Michel Salim - 2.8-9 +- clang++: fix platform-specific include dirs (# 680644) + * Thu Mar 17 2011 Michel Salim - 2.8-8 - clang++: also search for platform-specific include files (# 680644)