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 1/6] 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 2/6] - 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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)