Attachment 686861 Details for Bug 903100 – llvm 3.2 spec patch

[patch] llvm 3.2 spec patch

llvm-3.2.spec.patch (text/plain), 2.42 KB, created by Terje Røsten on 2013-01-24 17:39:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Terje Røsten

Created: 2013-01-24 17:39:03 UTC

Size: 2.42 KB

patch

obsolete

>diff --git a/llvm.spec b/llvm.spec
>index 4f7693f..395c527 100644
>--- a/llvm.spec
>+++ b/llvm.spec
>@@ -35,8 +35,8 @@ ExcludeArch: s390 s390x ppc ppc64
> %endif
> 
> Name:           llvm
>-Version:        3.1
>-Release:        13%{?dist}
>+Version:        3.2
>+Release:        1%{?dist}
> Summary:        The Low Level Virtual Machine
> 
> Group:          Development/Languages
>@@ -44,9 +44,11 @@ License:        NCSA
> URL:            http://llvm.org/
> Source0:        %{downloadurl}/llvm-%{version}%{?prerel:%{prerel}}.src.tar.gz
> Source1:        %{downloadurl}/clang-%{version}%{?prerel:%{prerel}}.src.tar.gz
>+Source2:        %{downloadurl}/compiler-rt-%{version}%{?prerel:%{prerel}}.src.tar.gz
>+
> # multilib fixes
>-Source2:        llvm-Config-config.h
>-Source3:        llvm-Config-llvm-config.h
>+Source3:        llvm-Config-config.h
>+Source4:        llvm-Config-llvm-config.h
> 
> 
> # Data files should be installed with timestamps preserved
>@@ -251,10 +253,12 @@ HTML documentation for LLVM's OCaml binding.
> 
> 
> %prep
>-%setup -q -n llvm-%{version}%{?prerel}.src %{?with_clang:-a1}
>+%setup -q -n llvm-%{version}%{?prerel}.src %{?with_clang:-a1}  %{?with_clang:-a2}
> rm -r -f tools/clang
> %if %{with clang}
> mv clang-%{version}%{?prerel}.src tools/clang
>+rm -r -f projects/compiler-rt
>+mv compiler-rt-%{version}%{?prerel}.src projects/compiler-rt
> %endif
> 
> # llvm patches
>@@ -262,15 +266,15 @@ mv clang-%{version}%{?prerel}.src tools/clang
> #patch1 -p1 -b .link_llvmgold_to_lto
> 
> # r600 llvm patch
>-%patch600 -p1 -b .r600
>-%patch601 -p1 -b .r601
>+#patch600 -p1 -b .r600
>+#patch601 -p1 -b .r601
> 
> # clang patches
> %if %{with clang}
> pushd tools/clang
>-%patch610 -p1 -b .r610
>-%patch611 -p1 -b .r611
>-%patch612 -p1 -b .r612
>+#patch610 -p1 -b .r610
>+#patch611 -p1 -b .r611
>+#patch612 -p1 -b .r612
> popd
> %endif
> 
>@@ -345,9 +349,9 @@ mv %{buildroot}%{_bindir}/llvm-config{,-%{__isa_bits}}
> 
> pushd %{buildroot}%{_includedir}/llvm/Config
> mv config.h config-%{__isa_bits}.h
>-cp -p %{SOURCE2} config.h
>+cp -p %{SOURCE3} config.h
> mv llvm-config.h llvm-config-%{__isa_bits}.h
>-cp -p %{SOURCE3} llvm-config.h
>+cp -p %{SOURCE4} llvm-config.h
> popd
> 
> # Create ld.so.conf.d entry
>@@ -561,6 +565,10 @@ exit 0
> %endif
> 
> %changelog
>+* Wed Jan 23 2013 Terje Rosten <terje.rosten@ntnu.no> - 3.2-1
>+- 3.2
>+- Add compiler-rt to enable AddressSanitizer and friends
>+
> * Wed Jan 23 2013 Jens Petersen <petersen@redhat.com> - 3.1-13
> - fix some docs pod markup errors to build with new perl-Pod-Parser
>

Actions: View | Diff

Attachments on bug 903100: 686861