commit: fc5dd6c4bc73484b85729c809142f9c69eb1f08f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Apr 22 11:13:15 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Apr 22 11:21:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc5dd6c4
sys-libs/libcxx: Switch to patchsets Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-libs/libcxx/Manifest | 5 +++++ .../libcxx/files/libcxx-3.9-cmake-link-flags.patch | 23 ---------------------- sys-libs/libcxx/libcxx-10.0.1.ebuild | 9 +-------- sys-libs/libcxx/libcxx-11.0.0.ebuild | 9 +-------- sys-libs/libcxx/libcxx-11.0.1.ebuild | 9 +-------- sys-libs/libcxx/libcxx-11.1.0.ebuild | 9 +-------- sys-libs/libcxx/libcxx-12.0.0.9999.ebuild | 9 +-------- sys-libs/libcxx/libcxx-12.0.0.ebuild | 5 +---- sys-libs/libcxx/libcxx-13.0.0.9999.ebuild | 9 +-------- 9 files changed, 12 insertions(+), 75 deletions(-) diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest index 09cfebc2769..88b3c48b1f1 100644 --- a/sys-libs/libcxx/Manifest +++ b/sys-libs/libcxx/Manifest @@ -1,3 +1,8 @@ +DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0 +DIST llvm-gentoo-patchset-11.0.0-1.tar.xz 6100 BLAKE2B 6f8fc9b7daa703f04b1283caaeb3665d4bec56ff80b1c5db35917c578fdd92617222bd2d2b83020144b8abdeaa261142b68aa3dee24350133f6721e41a167b78 SHA512 debdd92e6aa3133f474dfbd79f267e76d9d979e4e5d464c8d4343c6e6816b46376ca8080a9ee916152861907af9d0645ce71cf3582ef3dc31ec4ca3410fde9f6 +DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b +DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1 +DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf diff --git a/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch b/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch deleted file mode 100644 index bef5bc18754..00000000000 --- a/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d618e83..0e76525 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -293,6 +293,18 @@ remove_flags(-DNDEBUG -UNDEBUG -D_DEBUG - # so they don't get transformed into -Wno and -errors respectivly. - remove_flags(-Wno-pedantic -pedantic-errors -pedantic) - -+# FIXME: this is cribbed from HandleLLVMOptions.cmake. -+if(LIBCXX_STANDALONE_BUILD) -+ # Pass -Wl,-z,defs. This makes sure all symbols are defined. Otherwise a DSO -+ # build might work on ELF but fail on MachO/COFF. -+ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR -+ ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR -+ ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND -+ NOT LLVM_USE_SANITIZER) -+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs") -+ endif() -+endif() -+ - # Required flags ============================================================== - add_compile_flags_if_supported(-std=c++11) - if (NOT MSVC AND NOT LIBCXX_SUPPORTS_STD_EQ_CXX11_FLAG) diff --git a/sys-libs/libcxx/libcxx-10.0.1.ebuild b/sys-libs/libcxx/libcxx-10.0.1.ebuild index 4f386c12837..5c7c50377c3 100644 --- a/sys-libs/libcxx/libcxx-10.0.1.ebuild +++ b/sys-libs/libcxx/libcxx-10.0.1.ebuild @@ -10,6 +10,7 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs DESCRIPTION="New implementation of the C++ standard library, targeting C++11" HOMEPAGE="https://libcxx.llvm.org/" LLVM_COMPONENTS=( libcxx ) +LLVM_PATCHSET=10.0.1-1 llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" @@ -49,14 +50,6 @@ pkg_setup() { fi } -src_prepare() { - # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a - # out-of-tree build. - eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" - - llvm.org_src_prepare -} - test_compiler() { $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ <<<'int main() { return 0; }' &>/dev/null diff --git a/sys-libs/libcxx/libcxx-11.0.0.ebuild b/sys-libs/libcxx/libcxx-11.0.0.ebuild index f63adc4cf51..8f948316ac8 100644 --- a/sys-libs/libcxx/libcxx-11.0.0.ebuild +++ b/sys-libs/libcxx/libcxx-11.0.0.ebuild @@ -10,6 +10,7 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs DESCRIPTION="New implementation of the C++ standard library, targeting C++11" HOMEPAGE="https://libcxx.llvm.org/" LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) +LLVM_PATCHSET=11.0.0-1 llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" @@ -57,14 +58,6 @@ pkg_setup() { fi } -src_prepare() { - # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a - # out-of-tree build. - eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" - - llvm.org_src_prepare -} - test_compiler() { $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ <<<'int main() { return 0; }' &>/dev/null diff --git a/sys-libs/libcxx/libcxx-11.0.1.ebuild b/sys-libs/libcxx/libcxx-11.0.1.ebuild index 58ec9289d18..16172647c29 100644 --- a/sys-libs/libcxx/libcxx-11.0.1.ebuild +++ b/sys-libs/libcxx/libcxx-11.0.1.ebuild @@ -35,6 +35,7 @@ BDEPEND=" DOCS=( CREDITS.TXT ) LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) +LLVM_PATCHSET=11.1.0-1 llvm.org_set_globals python_check_deps() { @@ -58,14 +59,6 @@ pkg_setup() { fi } -src_prepare() { - # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a - # out-of-tree build. - eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" - - llvm.org_src_prepare -} - test_compiler() { $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ <<<'int main() { return 0; }' &>/dev/null diff --git a/sys-libs/libcxx/libcxx-11.1.0.ebuild b/sys-libs/libcxx/libcxx-11.1.0.ebuild index 58ec9289d18..16172647c29 100644 --- a/sys-libs/libcxx/libcxx-11.1.0.ebuild +++ b/sys-libs/libcxx/libcxx-11.1.0.ebuild @@ -35,6 +35,7 @@ BDEPEND=" DOCS=( CREDITS.TXT ) LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) +LLVM_PATCHSET=11.1.0-1 llvm.org_set_globals python_check_deps() { @@ -58,14 +59,6 @@ pkg_setup() { fi } -src_prepare() { - # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a - # out-of-tree build. - eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" - - llvm.org_src_prepare -} - test_compiler() { $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ <<<'int main() { return 0; }' &>/dev/null diff --git a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild index 8ed99383fe0..1f529867fb7 100644 --- a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild @@ -35,6 +35,7 @@ BDEPEND=" DOCS=( CREDITS.TXT ) LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) +LLVM_PATCHSET=9999-1 llvm.org_set_globals python_check_deps() { @@ -58,14 +59,6 @@ pkg_setup() { fi } -src_prepare() { - # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a - # out-of-tree build. - eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" - - llvm.org_src_prepare -} - test_compiler() { $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ <<<'int main() { return 0; }' &>/dev/null diff --git a/sys-libs/libcxx/libcxx-12.0.0.ebuild b/sys-libs/libcxx/libcxx-12.0.0.ebuild index d78106ed99e..21363361ae2 100644 --- a/sys-libs/libcxx/libcxx-12.0.0.ebuild +++ b/sys-libs/libcxx/libcxx-12.0.0.ebuild @@ -35,6 +35,7 @@ BDEPEND=" DOCS=( CREDITS.TXT ) LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) +LLVM_PATCHSET=12.0.0-1 llvm.org_set_globals python_check_deps() { @@ -59,10 +60,6 @@ pkg_setup() { } src_prepare() { - # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a - # out-of-tree build. - eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" - # Known failures. rm test/libcxx/gdb/gdb_pretty_printer_test.sh.cpp || die rm test/libcxx/memory/trivial_abi/unique_ptr_ret.pass.cpp || die diff --git a/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild index 8ed99383fe0..1f529867fb7 100644 --- a/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild @@ -35,6 +35,7 @@ BDEPEND=" DOCS=( CREDITS.TXT ) LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) +LLVM_PATCHSET=9999-1 llvm.org_set_globals python_check_deps() { @@ -58,14 +59,6 @@ pkg_setup() { fi } -src_prepare() { - # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a - # out-of-tree build. - eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" - - llvm.org_src_prepare -} - test_compiler() { $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ <<<'int main() { return 0; }' &>/dev/null