X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=llvm.spec;h=2e5359a25be636a7126b945f784e41031f0ebd02;hb=3a980ab4bd71d83f5524270baf598f4864e43c32;hp=1ff55962f272394dfc3583ef9441880decef105e;hpb=d706a70da5c1ad6aa6f6c858ebe9fb803500f118;p=packages%2Fllvm.git diff --git a/llvm.spec b/llvm.spec index 1ff5596..2e5359a 100644 --- a/llvm.spec +++ b/llvm.spec @@ -4,6 +4,7 @@ # %{_datadir}/clang/clang-format.el - emacs mode # %{_datadir}/clang/clang-format.py - vim plugin # - no content in doc package (it used to contain parts of clang apidocs and some examples) +# - system isl in polly? # # Conditional build: %bcond_without lldb # LLDB debugger @@ -23,35 +24,36 @@ 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.8.1 -Release: 0.1 +Version: 3.9.1 +Release: 3.2 License: University of Illinois/NCSA Open Source License Group: Development/Languages #Source0Download: http://llvm.org/releases/download.html Source0: http://llvm.org/releases/%{version}/%{name}-%{version}.src.tar.xz -# Source0-md5: 538467e6028bbc9259b1e6e015d25845 +# Source0-md5: 3259018a7437e157f3642df80f1983ea Source1: http://llvm.org/releases/%{version}/cfe-%{version}.src.tar.xz -# Source1-md5: 4ff2f8844a786edb0220f490f7896080 +# Source1-md5: 45713ec5c417ed9cad614cd283d786a1 Source2: http://llvm.org/releases/%{version}/compiler-rt-%{version}.src.tar.xz -# Source2-md5: f140db073d2453f854fbe01cc46f3110 +# Source2-md5: aadc76e7e180fafb10fb729444e287a3 Source3: http://llvm.org/releases/%{version}/lldb-%{version}.src.tar.xz -# Source3-md5: 9e4787b71be8e432fffd31e13ac87623 +# Source3-md5: 91399402f287d3f637db1207113deecb Source4: http://llvm.org/releases/%{version}/polly-%{version}.src.tar.xz -# Source4-md5: 8a40e697a4ba1c8b640b85d074bd6e25 +# Source4-md5: 2cc7fe2bd9539775ba140abfd375bec6 Source5: http://llvm.org/releases/%{version}/clang-tools-extra-%{version}.src.tar.xz -# Source5-md5: 6e49f285d0b366cc3cab782d8c92d382 +# Source5-md5: 1a01d545a064fcbc46a2f05f6880d3d7 Source6: http://llvm.org/releases/%{version}/lld-%{version}.src.tar.xz -# Source6-md5: 68cd069bf99c71ebcfbe01d557c0e14d +# Source6-md5: 6254dd138e23b098df4ef7840c11e2c8 Patch0: %{name}-lld-link.patch Patch1: %{name}-pld.patch Patch2: libdir.patch Patch3: x32-gcc-toolchain.patch Patch4: cmake-buildtype.patch Patch5: %{name}-ocaml-shared.patch +Patch6: D35246.diff URL: http://llvm.org/ BuildRequires: bash BuildRequires: bison -BuildRequires: cmake >= 2.8.8 +BuildRequires: cmake >= 3.4.3 BuildRequires: flex BuildRequires: gcc >= 5:3.4 # gcc4 might be installed, but not current __cc @@ -62,8 +64,10 @@ BuildRequires: __cc >= 3.4 BuildRequires: glibc-devel(x86_64) %endif BuildRequires: groff +BuildRequires: libedit-devel BuildRequires: libltdl-devel BuildRequires: libstdc++-devel >= 5:3.4 +BuildRequires: ncurses-devel %if %{with ocaml} BuildRequires: ocaml-ctypes-devel >= 0.4 BuildRequires: ocaml-findlib @@ -72,17 +76,18 @@ BuildRequires: ocaml-ounit %endif BuildRequires: perl-base >= 1:5.6 BuildRequires: perl-tools-pod +BuildRequires: python >= 1:2.7 BuildRequires: rpm-pythonprov %{?with_doc:BuildRequires: sphinx-pdg} BuildRequires: tar >= 1:1.22 BuildRequires: xz +BuildRequires: zlib-devel %if %{with apidocs} BuildRequires: doxygen BuildRequires: graphviz %endif %if %{with tests} BuildRequires: dejagnu -BuildRequires: python BuildRequires: tcl-devel %endif %if %{with rt} && %{with multilib} @@ -90,27 +95,28 @@ BuildRequires: tcl-devel BuildRequires: gcc-c++-multilib-32 BuildRequires: libstdc++-multilib-32-devel %endif +%ifarch x32 +BuildRequires: gcc-c++-multilib-32 +BuildRequires: libstdc++-multilib-32-devel +BuildRequires: gcc-c++-multilib-64 +BuildRequires: libstdc++-multilib-64-devel +%endif %endif %if %{with lldb} BuildRequires: epydoc %ifarch i386 i486 BuildRequires: libatomic-devel %endif -BuildRequires: libedit-devel BuildRequires: libxml2-devel >= 2 BuildRequires: ncurses-ext-devel BuildRequires: python-devel >= 2 BuildRequires: swig-python %endif %if %{with polly} -BuildRequires: cloog-isl-devel -# >= 0.18.2-2 -BuildRequires: gmp-devel -BuildRequires: isl-devel >= 0.14 -# optional -BuildRequires: pluto-devel -BuildRequires: scoplib-devel >= 0.2.1-2 -#cuda-devel +#BuildRequires: gmp-devel or imath-devel (private copy in polly/lib/External/isl/imath) +# private copy in polly/lib/External/isl +#BuildRequires: isl-devel >= 0.17.1 +#TODO (bcond): cuda-devel (with POLLY_ENABLE_GPGPU_CODEGEN=ON) %endif %if %{with ocaml} BuildConflicts: llvm-ocaml @@ -121,10 +127,13 @@ Requires: %{name}-libs = %{version}-%{release} ExcludeArch: ppc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define abi 3.8 +%define abi 3.9 %define _sysconfdir /etc/%{name} %define specflags_ppc -fno-var-tracking-assignments +# ix86 and x32 - the same issue as https://llvm.org/bugs/show_bug.cgi?id=27237 +%define specflags_ia32 -gsplit-dwarf +%define specflags_x32 -gsplit-dwarf # strip corrupts: $RPM_BUILD_ROOT/usr/lib64/llvm-gcc/bin/llvm-c++ ... %define _noautostrip .*/\\(libmud.*\\.a\\|bin/llvm-.*\\|lib.*++\\.a\\) @@ -446,7 +455,9 @@ Summary: OCaml binding for LLVM Summary(pl.UTF-8): Wiązanie OCamla do LLVM-a Group: Libraries Requires: %{name} = %{version}-%{release} +%if %{with ocaml} %requires_eq ocaml-runtime +%endif %description ocaml OCaml binding for LLVM. @@ -496,6 +507,7 @@ Dokumentacja HTML wiązania OCamla do LLVM-a. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p0 grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{ s,^#!.*bin/env python,#!%{__python}, @@ -531,6 +543,8 @@ CPPFLAGS="%{rpmcppflags} -D_FILE_OFFSET_BITS=64" -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DENABLE_LINKER_BUILD_ID:BOOL=ON \ + -DLLVM_BINUTILS_INCDIR:STRING=%{_includedir} \ ../ %{__make} \ @@ -554,7 +568,6 @@ CPPFLAGS="%{rpmcppflags} -D_FILE_OFFSET_BITS=64" %{__make} -C tools/lld/docs docs-lld-html %{__make} -C tools/lldb/docs lldb-python-doc %{__make} -C tools/lldb/docs lldb-cpp-doc -%{__make} -C ../tools/clang/tools/extra/docs html %endif %install @@ -570,7 +583,7 @@ rm -rf $RPM_BUILD_ROOT # http://clang-analyzer.llvm.org/installation#OtherPlatforms install -d $RPM_BUILD_ROOT%{_libdir}/scan-build %{__mv} $RPM_BUILD_ROOT%{_prefix}/libexec/c??-analyzer $RPM_BUILD_ROOT%{_libdir}/scan-build -%{__sed} -i -e 's,/\.\./libexec/,../%{_lib}/scan-build/,' $RPM_BUILD_ROOT%{_bindir}/scan-build +%{__sed} -i -e 's,/\.\./libexec/,/../%{_lib}/scan-build/,' $RPM_BUILD_ROOT%{_bindir}/scan-build %py_comp $RPM_BUILD_ROOT%{_datadir}/scan-view %py_ocomp $RPM_BUILD_ROOT%{_datadir}/scan-view %py_postclean %{_datadir}/scan-view @@ -613,6 +626,8 @@ done %{__rm} $RPM_BUILD_ROOT%{_datadir}/clang/clang-format-bbedit.applescript # use system six %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/six.py* +# it seems it is used internally by an extra clang tool +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libfindAllSymbols.a %clean rm -rf $RPM_BUILD_ROOT @@ -640,6 +655,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/llvm-dis %attr(755,root,root) %{_bindir}/llvm-dsymutil %attr(755,root,root) %{_bindir}/llvm-dwarfdump +%attr(755,root,root) %{_bindir}/llvm-dwp %attr(755,root,root) %{_bindir}/llvm-extract %attr(755,root,root) %{_bindir}/llvm-lib %attr(755,root,root) %{_bindir}/llvm-link @@ -653,6 +669,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/llvm-readobj %attr(755,root,root) %{_bindir}/llvm-rtdyld %attr(755,root,root) %{_bindir}/llvm-size +%attr(755,root,root) %{_bindir}/llvm-split %attr(755,root,root) %{_bindir}/llvm-stress %attr(755,root,root) %{_bindir}/llvm-symbolizer %attr(755,root,root) %{_bindir}/llvm-tblgen @@ -661,6 +678,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/obj2yaml %attr(755,root,root) %{_bindir}/opt %attr(755,root,root) %{_bindir}/sancov +%attr(755,root,root) %{_bindir}/sanstats %attr(755,root,root) %{_bindir}/verify-uselistorder %attr(755,root,root) %{_bindir}/yaml2obj %if %{with doc} @@ -694,6 +712,7 @@ rm -rf $RPM_BUILD_ROOT # non-soname symlink %attr(755,root,root) %{_libdir}/libLLVM-%{version}.so %attr(755,root,root) %{_libdir}/libLTO.so +%attr(755,root,root) %{_libdir}/LLVMgold.so %files devel %defattr(644,root,root,755) @@ -703,8 +722,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libLLVM*.a %{_includedir}/llvm %{_includedir}/llvm-c -%dir %{_datadir}/llvm -%{_datadir}/llvm/cmake +%{_libdir}/cmake/llvm %if %{with doc} %{_mandir}/man1/llvm-config.1* %endif @@ -721,13 +739,14 @@ rm -rf $RPM_BUILD_ROOT %if %{with polly} %files polly %defattr(644,root,root,755) -%doc tools/polly/{CREDITS.txt,LICENSE.txt,README} +%doc tools/polly/{CREDITS.txt,LICENSE.txt,README} tools/polly/www/{bugs,changelog,contributors}.html %attr(755,root,root) %{_libdir}/LLVMPolly.so %files polly-devel %defattr(644,root,root,755) %{_libdir}/libPolly.a %{_libdir}/libPollyISL.a +%{_libdir}/libPollyPPCG.a %{_includedir}/polly %endif @@ -745,7 +764,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/clang/%{version} %{_libdir}/clang/%{version}/include %if %{with rt} -%ifarch %{ix86} %{x8664} +%ifarch %{ix86} %{x8664} x32 %dir %{_libdir}/clang/%{version}/lib %dir %{_libdir}/clang/%{version}/lib/linux %endif @@ -758,13 +777,13 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.so %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.a.syms %endif -%ifarch %{ix86} %{x8664} %{arm} aarch64 mips mips64 ppc64 +%ifarch %{ix86} %{x8664} x32 %{arm} aarch64 mips mips64 ppc64 %{_libdir}/clang/%{version}/asan_blacklist.txt %endif -%ifarch %{ix86} %{x8664} mips64 +%ifarch %{ix86} %{x8664} x32 mips64 %{_libdir}/clang/%{version}/cfi_blacklist.txt %endif -%ifarch %{x8664} aarch64 mips64 +%ifarch %{x8664} x32 aarch64 mips64 %{_libdir}/clang/%{version}/dfsan_abilist.txt %{_libdir}/clang/%{version}/msan_blacklist.txt %endif @@ -777,12 +796,17 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libclang.so.%{abi} %if %{with rt} && %{with multilib} -%ifarch %{x8664} +%ifarch %{x8664} x32 %files -n clang-multilib %defattr(644,root,root,755) %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-i386.a %attr(755,root,root) %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-i386.so %endif +%ifarch x32 +%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.a +%attr(755,root,root) %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.so +%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.a.syms +%endif %endif %files -n clang-analyzer @@ -802,7 +826,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libclang*.a %{_includedir}/clang %{_includedir}/clang-c -%{_datadir}/clang/cmake +%{_libdir}/cmake/clang %files -n clang-doc %defattr(644,root,root,755) @@ -816,15 +840,19 @@ rm -rf $RPM_BUILD_ROOT %files -n clang-tools-extra %defattr(644,root,root,755) -%doc tools/clang/tools/extra/{CODE_OWNERS.TXT,README.txt} tools/clang/tools/extra/docs/_build/html/{*.html,*.js,_static} +%doc tools/clang/tools/extra/{CODE_OWNERS.TXT,README.txt} %attr(755,root,root) %{_bindir}/clang-apply-replacements +%attr(755,root,root) %{_bindir}/clang-include-fixer %attr(755,root,root) %{_bindir}/clang-query %attr(755,root,root) %{_bindir}/clang-rename %attr(755,root,root) %{_bindir}/clang-tidy +%attr(755,root,root) %{_bindir}/find-all-symbols %attr(755,root,root) %{_bindir}/modularize %attr(755,root,root) %{_bindir}/pp-trace +%{_datadir}/clang/clang-include-fixer.py %{_datadir}/clang/clang-tidy-diff.py %{_datadir}/clang/run-clang-tidy.py +%{_datadir}/clang/run-find-all-symbols.py %files -n lld %defattr(644,root,root,755)