libcxx.spec

@@ -3,7 +3,11 @@
 %ifnarch riscv64
 %global toolchain clang
 %endif
-%global bootstrap 0
+%global bootstrap 1
+
+%ifarch riscv64
+%global debug_package %{nil}
+%endif
 
 %global libcxx_version 15.0.0
 #global rc_ver 3
@@ -11,7 +15,7 @@
 
 Name:		libcxx
 Version:	%{libcxx_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	2.2.riscv64%{?dist}
+Release:	2%{?dist}
 Summary:	C++ standard library targeting C++11
 License:	MIT or NCSA
 URL:		http://libcxx.llvm.org/
@@ -29,9 +33,7 @@ BuildRequires:  python3-devel
 BuildRequires:	libcxxabi-static
 BuildRequires:	libcxxabi-devel
 
-%if %{bootstrap} < 1
 BuildRequires:	python3
-%endif
 
 
 # For origin certification
@@ -85,8 +87,8 @@ common_cmake_flags="\
 %if %{bootstrap} < 1
 	-DLIBCXX_CXX_ABI=system-libcxxabi \
 	-DLIBCXX_CXX_ABI_INCLUDE_PATHS=$LIBCXX_ABI_PATH \
-	-DPython3_EXECUTABLE=%{_bindir}/python3 \
 %endif
+	-DPython3_EXECUTABLE=%{_bindir}/python3 \
 	-DLIBCXX_INCLUDE_BENCHMARKS=OFF \
 	-DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo"
@@ -99,8 +101,7 @@ common_cmake_flags="\
 	-DLIBCXX_ENABLE_STATIC=ON \
 	-DLIBCXX_ENABLE_SHARED=OFF \
 	-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \
-	-DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \
-	-DLIBCXX_CXX_ABI_LIBRARY_PATH=%{_libdir}
+	-DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON
 
 %cmake_build
 
@@ -123,18 +124,6 @@ mv tmp.a libc++.a
 ranlib libc++.a
 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
 
 %cmake_install
@@ -149,12 +138,10 @@ install -m 0644 src/include/*.h %{buildroot}%{_includedir}/libcxx-internal/
 %files
 %license LICENSE.TXT
 %doc CREDITS.TXT TODO.TXT
-%{_libdir}/libc++.so.*
 
 %files devel
 %{_includedir}/libcxx-internal/
 %{_includedir}/c++/
-%{_libdir}/libc++.so
 
 %files static
 %license LICENSE.TXT
@@ -162,8 +149,8 @@ install -m 0644 src/include/*.h %{buildroot}%{_includedir}/libcxx-internal/
 
 
 %changelog
-* Sat Oct 08 2022 David Abdurachmanov <davidlt@rivosinc.com> - 15.0.0-2.0.riscv64
-- Bootstrap again on riscv64 (new libcxxabi)
+* 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
 - Link libc++.a against libc++abi.a