Revert previous changes
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
parent
189e2a0f83
commit
8a49ba84d9
32
libcxx.spec
32
libcxx.spec
|
@ -1,13 +1,7 @@
|
||||||
# If you need to bootstrap this, turn this on.
|
# If you need to bootstrap this, turn this on.
|
||||||
# Otherwise, you have a loop with libcxxabi
|
# Otherwise, you have a loop with libcxxabi
|
||||||
%ifnarch riscv64
|
|
||||||
%global toolchain clang
|
%global toolchain clang
|
||||||
%endif
|
%global bootstrap 0
|
||||||
%global bootstrap 1
|
|
||||||
|
|
||||||
%ifarch riscv64
|
|
||||||
%global debug_package %{nil}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%global libcxx_version 15.0.0
|
%global libcxx_version 15.0.0
|
||||||
#global rc_ver 3
|
#global rc_ver 3
|
||||||
|
@ -33,7 +27,9 @@ BuildRequires: python3-devel
|
||||||
BuildRequires: libcxxabi-static
|
BuildRequires: libcxxabi-static
|
||||||
BuildRequires: libcxxabi-devel
|
BuildRequires: libcxxabi-devel
|
||||||
|
|
||||||
|
%if %{bootstrap} < 1
|
||||||
BuildRequires: python3
|
BuildRequires: python3
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
# For origin certification
|
# For origin certification
|
||||||
|
@ -87,8 +83,8 @@ common_cmake_flags="\
|
||||||
%if %{bootstrap} < 1
|
%if %{bootstrap} < 1
|
||||||
-DLIBCXX_CXX_ABI=system-libcxxabi \
|
-DLIBCXX_CXX_ABI=system-libcxxabi \
|
||||||
-DLIBCXX_CXX_ABI_INCLUDE_PATHS=$LIBCXX_ABI_PATH \
|
-DLIBCXX_CXX_ABI_INCLUDE_PATHS=$LIBCXX_ABI_PATH \
|
||||||
%endif
|
|
||||||
-DPython3_EXECUTABLE=%{_bindir}/python3 \
|
-DPython3_EXECUTABLE=%{_bindir}/python3 \
|
||||||
|
%endif
|
||||||
-DLIBCXX_INCLUDE_BENCHMARKS=OFF \
|
-DLIBCXX_INCLUDE_BENCHMARKS=OFF \
|
||||||
-DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \
|
-DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo"
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo"
|
||||||
|
@ -101,7 +97,8 @@ common_cmake_flags="\
|
||||||
-DLIBCXX_ENABLE_STATIC=ON \
|
-DLIBCXX_ENABLE_STATIC=ON \
|
||||||
-DLIBCXX_ENABLE_SHARED=OFF \
|
-DLIBCXX_ENABLE_SHARED=OFF \
|
||||||
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \
|
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \
|
||||||
-DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON
|
-DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \
|
||||||
|
-DLIBCXX_CXX_ABI_LIBRARY_PATH=%{_libdir}
|
||||||
|
|
||||||
%cmake_build
|
%cmake_build
|
||||||
|
|
||||||
|
@ -124,6 +121,18 @@ mv tmp.a libc++.a
|
||||||
ranlib libc++.a
|
ranlib libc++.a
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
%cmake -GNinja \
|
||||||
|
$common_cmake_flags \
|
||||||
|
-DLIBCXX_STANDALONE_BUILD=ON \
|
||||||
|
%if %{bootstrap} < 1
|
||||||
|
-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=ON \
|
||||||
|
%endif
|
||||||
|
-DLIBCXX_ENABLE_STATIC=OFF \
|
||||||
|
-DLIBCXX_ENABLE_SHARED=ON \
|
||||||
|
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=OFF
|
||||||
|
|
||||||
|
%cmake_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
||||||
%cmake_install
|
%cmake_install
|
||||||
|
@ -138,10 +147,12 @@ install -m 0644 src/include/*.h %{buildroot}%{_includedir}/libcxx-internal/
|
||||||
%files
|
%files
|
||||||
%license LICENSE.TXT
|
%license LICENSE.TXT
|
||||||
%doc CREDITS.TXT TODO.TXT
|
%doc CREDITS.TXT TODO.TXT
|
||||||
|
%{_libdir}/libc++.so.*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_includedir}/libcxx-internal/
|
%{_includedir}/libcxx-internal/
|
||||||
%{_includedir}/c++/
|
%{_includedir}/c++/
|
||||||
|
%{_libdir}/libc++.so
|
||||||
|
|
||||||
%files static
|
%files static
|
||||||
%license LICENSE.TXT
|
%license LICENSE.TXT
|
||||||
|
@ -149,9 +160,6 @@ install -m 0644 src/include/*.h %{buildroot}%{_includedir}/libcxx-internal/
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Oct 07 2022 David Abdurachmanov <davidlt@rivosinc.com> - 15.0.0-2.0.riscv64
|
|
||||||
- Bootstrap on riscv64
|
|
||||||
|
|
||||||
* Tue Sep 13 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-2
|
* Tue Sep 13 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-2
|
||||||
- Link libc++.a against libc++abi.a
|
- Link libc++.a against libc++abi.a
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue