remove building with libc++ to fix e.g. Mesa build [release 6.0.1-4mamba;Sun Sep 02 2018]
This commit is contained in:
parent
6e5c54107f
commit
58c4424420
62
llvm.spec
62
llvm.spec
@ -2,7 +2,7 @@
|
||||
%define majver %(echo %version | cut -d. -f1-2)
|
||||
Name: llvm
|
||||
Version: 6.0.1
|
||||
Release: 3mamba
|
||||
Release: 4mamba
|
||||
Summary: The Low Level Virtual Machine
|
||||
Group: Development/Languages
|
||||
Vendor: openmamba
|
||||
@ -16,8 +16,6 @@ Source3: https://releases.llvm.org/%{version}/clang-tools-extra-%{version}
|
||||
Source4: https://releases.llvm.org/%{version}/lld-%{version}.src.tar.xz
|
||||
Source5: https://releases.llvm.org/%{version}/lldb-%{version}.src.tar.xz
|
||||
Source6: llvm-6.0.0-llvm-config.patch
|
||||
Source7: https://releases.llvm.org/%{version}/libcxx-%{version}.src.tar.xz
|
||||
Source8: https://releases.llvm.org/%{version}/libcxxabi-%{version}.src.tar.xz
|
||||
Patch0: %{name}-3.1-llvm-config.patch
|
||||
Patch1: llvm-3.4-default-to-i586.patch
|
||||
Patch2: llvm-5.0.0-openmamba-triplet.patch
|
||||
@ -74,7 +72,6 @@ Group: Development/Languages
|
||||
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||
Provides: llvm-devel
|
||||
Obsoletes: llvm-devel
|
||||
Requires: libc++-devel
|
||||
|
||||
%description -n lib%{name}-devel
|
||||
The LLVM Project is a collection of modular and reusable compiler and toolchain technologies.
|
||||
@ -100,30 +97,6 @@ The LLVM Project is a collection of modular and reusable compiler and toolchain
|
||||
Despite its name, LLVM has little to do with traditional virtual machines, though it does provide helpful libraries that can be used to build them.
|
||||
This package contains additional LLVM tools.
|
||||
|
||||
%package -n libc++
|
||||
Group: System/Libraries
|
||||
Summary: libc++ shared library for %{name}
|
||||
|
||||
%description -n libc++
|
||||
This package contains the libc++ shared library for %{name}.
|
||||
|
||||
%package -n libc++-devel
|
||||
Summary: Libraries and header files for libc++
|
||||
Group: Development/Languages
|
||||
Requires: libc++ = %{?epoch:%epoch:}%{version}-%{release}
|
||||
|
||||
%description -n libc++-devel
|
||||
This package contains libc++ library and header files needed to develop new native programs that use the LLVM infrastructure.
|
||||
|
||||
%package -n libc++-apidocs
|
||||
Group: Documentation
|
||||
Summary: libc++ API documentation
|
||||
Requires: libc++-devel = %{?epoch:%epoch:}%{version}-%{release}
|
||||
Requires: gtk-doc
|
||||
|
||||
%description -n libc++-apidocs
|
||||
This package includes the libc++ API documentation.
|
||||
|
||||
%package -n clang
|
||||
Summary: LLVM native C/C++/Objective-C compiler
|
||||
Group: Development/Languages
|
||||
@ -187,9 +160,8 @@ Requires: gtk-doc
|
||||
This package includes the LLVM ocaml API documentation.
|
||||
|
||||
%prep
|
||||
%setup -q -a1 -a2 -a3 -a4 -a5 -a7 -a8 -n %{name}-%{version}.src
|
||||
%setup -q -a1 -a2 -a3 -a4 -a5 -n %{name}-%{version}.src
|
||||
#% setup -q -n %{name}-%{version}.src -D -T
|
||||
#:<< __EOF
|
||||
|
||||
#%patch0 -p1
|
||||
#%patch1 -p1
|
||||
@ -198,8 +170,6 @@ mv compiler-rt-%{version}.src projects/compiler-rt
|
||||
mv clang-tools-extra-%{version}.src tools/clang/tools/extra
|
||||
mv lld-%{version}.src tools/lld
|
||||
mv lldb-%{version}.src tools/lldb
|
||||
mv libcxx-%{version}.src projects/libcxx
|
||||
mv libcxxabi-%{version}.src projects/libcxxabi
|
||||
|
||||
%patch2 -p1
|
||||
#%patch3 -p1
|
||||
@ -223,7 +193,6 @@ mv libcxxabi-%{version}.src projects/libcxxabi
|
||||
sed -i "/REMOVE_DUPLICATES/d" tools/llvm-shlib/CMakeLists.txt
|
||||
|
||||
%build
|
||||
#:<< _EOF
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake \
|
||||
@ -247,12 +216,8 @@ cmake \
|
||||
-DLLDB_DISABLE_PYTHON=ON \
|
||||
-DLLVM_INSTALL_UTILS=ON \
|
||||
-DLLVM_ENABLE_SPHINX=ON \
|
||||
-DLLVM_ENABLE_LIBCXX=ON \
|
||||
-DLLVM_ENABLE_LIBCXXABI=ON \
|
||||
%ifarch x86_64
|
||||
-DLLVM_LIBDIR_SUFFIX="64" \
|
||||
-DLIBCXX_LIBDIR_SUFFIX="64" \
|
||||
-DLIBCXXABI_LIBDIR_SUFFIX="64" \
|
||||
%endif
|
||||
-DSPHINX_WARNINGS_AS_ERRORS=OFF \
|
||||
%ifnarch arm
|
||||
@ -456,26 +421,6 @@ rm -f %{buildroot}%{_datadir}/doc/llvm/html/.buildinfo
|
||||
%defattr(-,root,root)
|
||||
%doc tools/clang/docs
|
||||
|
||||
%files -n libc++
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libc++.so.*
|
||||
%{_libdir}/libc++abi.so.*
|
||||
|
||||
%files -n libc++-devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/c++
|
||||
%{_includedir}/c++/*
|
||||
%{_libdir}/libc++.a
|
||||
%{_libdir}/libc++.so
|
||||
%{_libdir}/libc++abi.a
|
||||
%{_libdir}/libc++abi.so
|
||||
%{_libdir}/libc++experimental.a
|
||||
|
||||
%files -n libc++-apidocs
|
||||
%defattr(-,root,root)
|
||||
%dir %{_datadir}/doc/libcxx
|
||||
%{_datadir}/doc/libcxx/*
|
||||
|
||||
%files ocaml
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/ocaml/llvm/*.cma
|
||||
@ -494,6 +439,9 @@ rm -f %{buildroot}%{_datadir}/doc/llvm/html/.buildinfo
|
||||
%{_docdir}/llvm/ocaml-html/*
|
||||
|
||||
%changelog
|
||||
* Sun Sep 02 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.1-4mamba
|
||||
- remove building with libc++ to fix e.g. Mesa build
|
||||
|
||||
* Sat Jul 14 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.1-3mamba
|
||||
- rebuilt wth LLVM_ENABLE_LIBCXX=ON
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user