From f84e0bd3e7f13888c343883bbc5e0b26b0694bf3 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 12 Oct 2023 08:56:00 +0100 Subject: dev-libs/botan: backport upstream fix for ninja & switch back to it. This reverts commit 5fb454ae567ba6c7c71616b602ce641b5ab7f216. Go back to ninja with the patch, but let's revbump Just In Case as it's possible that a different binary got installed given the nature of the patch. Bug: https://bugs.gentoo.org/915544 Signed-off-by: Sam James --- dev-libs/botan/botan-3.2.0-r1.ebuild | 229 +++++++++++++++++++++++++++ dev-libs/botan/botan-3.2.0.ebuild | 222 -------------------------- dev-libs/botan/files/botan-3.2.0-ninja.patch | 20 +++ 3 files changed, 249 insertions(+), 222 deletions(-) create mode 100644 dev-libs/botan/botan-3.2.0-r1.ebuild delete mode 100644 dev-libs/botan/botan-3.2.0.ebuild create mode 100644 dev-libs/botan/files/botan-3.2.0-ninja.patch (limited to 'dev-libs/botan') diff --git a/dev-libs/botan/botan-3.2.0-r1.ebuild b/dev-libs/botan/botan-3.2.0-r1.ebuild new file mode 100644 index 000000000000..bd7375f6945b --- /dev/null +++ b/dev-libs/botan/botan-3.2.0-r1.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc +inherit edo flag-o-matic multiprocessing ninja-utils python-r1 toolchain-funcs verify-sig + +MY_P="Botan-${PV}" +DESCRIPTION="C++ crypto library" +HOMEPAGE="https://botan.randombit.net/" +SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz" +SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD-2" +# New major versions are parallel-installable +SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos" +IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" +RESTRICT="!test? ( test )" + +CPU_USE=( + cpu_flags_arm_{aes,neon,sha1,sha2} + cpu_flags_ppc_altivec + cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2} +) + +IUSE+=" ${CPU_USE[@]}" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# NOTE: Boost is needed at runtime too for the CLI tool. +DEPEND=" + boost? ( dev-libs/boost:= ) + bzip2? ( >=app-arch/bzip2-1.0.5:= ) + lzma? ( app-arch/xz-utils:= ) + python? ( ${PYTHON_DEPS} ) + sqlite? ( dev-db/sqlite:3= ) + zlib? ( >=sys-libs/zlib-1.2.3:= ) +" +RDEPEND=" + ${DEPEND} + !=gcc-11 or >=clang-14 to compile." + eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" + die "GCC version is too old to compile Botan!" + elif tc-is-clang && ver_test $(clang-version) -lt 14 ; then + eerror "Botan needs >=gcc-11 or >=clang-14 to compile." + eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" + die "Clang version is too old to compile Botan!" + fi +} + +src_configure() { + tc-export AR CC CXX + python_setup + + local disable_modules=( + $(usev !boost 'boost') + ) + + if [[ -z "${DISABLE_MODULES}" ]] ; then + elog "Disabling module(s): ${disable_modules[@]}" + fi + + local chostarch="${CHOST%%-*}" + + # Arch specific wrangling + local myos= + case ${CHOST} in + *-darwin*) + myos=darwin + ;; + *) + myos=linux + + if [[ ${CHOST} == *hppa* ]] ; then + chostarch=parisc + elif [[ ${ABI} == sparc64 ]] ; then + chostarch="sparc64" + elif [[ ${ABI} == sparc32 ]] ; then + chostarch="sparc32" + fi + ;; + esac + + local pythonvers=() + if use python ; then + _append() { + pythonvers+=( ${EPYTHON/python/} ) + } + + python_foreach_impl _append + fi + + local myargs=( + # Intrinsics + # TODO: x86 RDSEED (new CPU_FLAGS_X86?) + # TODO: POWER Crypto (new CPU_FLAGS_PPC?) + $(usev !cpu_flags_arm_aes '--disable-armv8crypto') + $(usev !cpu_flags_arm_neon '--disable-neon') + $(usev !cpu_flags_arm_sha1 '--disable-armv8crypto') + $(usev !cpu_flags_arm_sha2 '--disable-armv8crypto') + $(usev !cpu_flags_ppc_altivec '--disable-altivec') + $(usev !cpu_flags_x86_aes '--disable-aes-ni') + $(usev !cpu_flags_x86_avx2 '--disable-avx2') + $(usev !cpu_flags_x86_popcnt '--disable-bmi2') + $(usev !cpu_flags_x86_rdrand '--disable-rdrand') + $(usev !cpu_flags_x86_sha '--disable-sha-ni') + $(usev !cpu_flags_x86_sse2 '--disable-sse2') + $(usev !cpu_flags_x86_ssse3 '--disable-ssse3') + $(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1') + $(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2') + + # HPPA's GCC doesn't support SSP + $(usev hppa '--without-stack-protector') + + $(use_with boost) + $(use_with bzip2) + $(use_with doc documentation) + $(use_with doc sphinx) + $(use_with lzma) + $(use_enable static-libs static-library) + $(use_with sqlite sqlite3) + $(use_with zlib) + + --build-tool=ninja + --cpu=${chostarch} + --docdir=share/doc + --disable-modules=$(IFS=","; echo "${disable_modules[*]}") + --distribution-info="Gentoo ${PVR}" + --libdir="$(get_libdir)" + # Avoid collisions between slots for tools (bug #905700) + --program-suffix=$(ver_cut 1) + + # Don't install Python bindings automatically + # (do it manually later in the right place) + # bug #723096 + --no-install-python-module + + --os=${myos} + --prefix="${EPREFIX}"/usr + --with-endian="$(tc-endian)" + --with-python-version=$(IFS=","; echo "${pythonvers[*]}") + ) + + local build_targets=( + shared + $(usev static-libs static) + $(usev tools cli) + $(usev test tests) + ) + + myargs+=( + --build-targets=$(IFS=","; echo "${build_targets[*]}") + ) + + if use elibc_glibc && use kernel_linux ; then + myargs+=( + --with-os-features=getrandom,getentropy + ) + fi + + local sanitizers=() + if is-flagq -fsanitize=address ; then + sanitizers+=( address ) + fi + if is-flagq -fsanitize=undefined ; then + sanitizers+=( undefined ) + fi + filter-flags '-fsanitize=*' + myargs+=( + --enable-sanitizers=$(IFS=","; echo "${sanitizers[*]}") + ) + + edo ${EPYTHON} configure.py --verbose "${myargs[@]}" +} + +src_compile() { + eninja +} + +src_test() { + LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)" +} + +src_install() { + DESTDIR="${D}" eninja install + + if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then + # --docdir in configure controls the parent directory unfortunately + mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die + fi + + # Manually install the Python bindings (bug #723096) + if use python ; then + python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py + fi +} diff --git a/dev-libs/botan/botan-3.2.0.ebuild b/dev-libs/botan/botan-3.2.0.ebuild deleted file mode 100644 index bb651261749f..000000000000 --- a/dev-libs/botan/botan-3.2.0.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc -inherit edo flag-o-matic multiprocessing python-r1 toolchain-funcs verify-sig - -MY_P="Botan-${PV}" -DESCRIPTION="C++ crypto library" -HOMEPAGE="https://botan.randombit.net/" -SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz" -SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD-2" -# New major versions are parallel-installable -SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos" -IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" -RESTRICT="!test? ( test )" - -CPU_USE=( - cpu_flags_arm_{aes,neon,sha1,sha2} - cpu_flags_ppc_altivec - cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2} -) - -IUSE+=" ${CPU_USE[@]}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# NOTE: Boost is needed at runtime too for the CLI tool. -DEPEND=" - boost? ( dev-libs/boost:= ) - bzip2? ( >=app-arch/bzip2-1.0.5:= ) - lzma? ( app-arch/xz-utils:= ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3= ) - zlib? ( >=sys-libs/zlib-1.2.3:= ) -" -RDEPEND=" - ${DEPEND} - !=gcc-11 or >=clang-14 to compile." - eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" - die "GCC version is too old to compile Botan!" - elif tc-is-clang && ver_test $(clang-version) -lt 14 ; then - eerror "Botan needs >=gcc-11 or >=clang-14 to compile." - eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" - die "Clang version is too old to compile Botan!" - fi -} - -src_configure() { - tc-export AR CC CXX - python_setup - - local disable_modules=( - $(usev !boost 'boost') - ) - - if [[ -z "${DISABLE_MODULES}" ]] ; then - elog "Disabling module(s): ${disable_modules[@]}" - fi - - local chostarch="${CHOST%%-*}" - - # Arch specific wrangling - local myos= - case ${CHOST} in - *-darwin*) - myos=darwin - ;; - *) - myos=linux - - if [[ ${CHOST} == *hppa* ]] ; then - chostarch=parisc - elif [[ ${ABI} == sparc64 ]] ; then - chostarch="sparc64" - elif [[ ${ABI} == sparc32 ]] ; then - chostarch="sparc32" - fi - ;; - esac - - local pythonvers=() - if use python ; then - _append() { - pythonvers+=( ${EPYTHON/python/} ) - } - - python_foreach_impl _append - fi - - local myargs=( - # Intrinsics - # TODO: x86 RDSEED (new CPU_FLAGS_X86?) - # TODO: POWER Crypto (new CPU_FLAGS_PPC?) - $(usev !cpu_flags_arm_aes '--disable-armv8crypto') - $(usev !cpu_flags_arm_neon '--disable-neon') - $(usev !cpu_flags_arm_sha1 '--disable-armv8crypto') - $(usev !cpu_flags_arm_sha2 '--disable-armv8crypto') - $(usev !cpu_flags_ppc_altivec '--disable-altivec') - $(usev !cpu_flags_x86_aes '--disable-aes-ni') - $(usev !cpu_flags_x86_avx2 '--disable-avx2') - $(usev !cpu_flags_x86_popcnt '--disable-bmi2') - $(usev !cpu_flags_x86_rdrand '--disable-rdrand') - $(usev !cpu_flags_x86_sha '--disable-sha-ni') - $(usev !cpu_flags_x86_sse2 '--disable-sse2') - $(usev !cpu_flags_x86_ssse3 '--disable-ssse3') - $(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1') - $(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2') - - # HPPA's GCC doesn't support SSP - $(usev hppa '--without-stack-protector') - - $(use_with boost) - $(use_with bzip2) - $(use_with doc documentation) - $(use_with doc sphinx) - $(use_with lzma) - $(use_enable static-libs static-library) - $(use_with sqlite sqlite3) - $(use_with zlib) - - # Broken in 3.2.0, bug #915544 - #--build-tool=ninja - --cpu=${chostarch} - --docdir=share/doc - --disable-modules=$(IFS=","; echo "${disable_modules[*]}") - --distribution-info="Gentoo ${PVR}" - --libdir="$(get_libdir)" - # Avoid collisions between slots for tools (bug #905700) - --program-suffix=$(ver_cut 1) - - # Don't install Python bindings automatically - # (do it manually later in the right place) - # bug #723096 - --no-install-python-module - - --os=${myos} - --prefix="${EPREFIX}"/usr - --with-endian="$(tc-endian)" - --with-python-version=$(IFS=","; echo "${pythonvers[*]}") - ) - - local build_targets=( - shared - $(usev static-libs static) - $(usev tools cli) - $(usev test tests) - ) - - myargs+=( - --build-targets=$(IFS=","; echo "${build_targets[*]}") - ) - - if use elibc_glibc && use kernel_linux ; then - myargs+=( - --with-os-features=getrandom,getentropy - ) - fi - - local sanitizers=() - if is-flagq -fsanitize=address ; then - sanitizers+=( address ) - fi - if is-flagq -fsanitize=undefined ; then - sanitizers+=( undefined ) - fi - filter-flags '-fsanitize=*' - myargs+=( - --enable-sanitizers=$(IFS=","; echo "${sanitizers[*]}") - ) - - edo ${EPYTHON} configure.py --verbose "${myargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)" -} - -src_install() { - default - - if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then - # --docdir in configure controls the parent directory unfortunately - mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die - fi - - # Manually install the Python bindings (bug #723096) - if use python ; then - python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py - fi -} diff --git a/dev-libs/botan/files/botan-3.2.0-ninja.patch b/dev-libs/botan/files/botan-3.2.0-ninja.patch new file mode 100644 index 000000000000..826fc496fb31 --- /dev/null +++ b/dev-libs/botan/files/botan-3.2.0-ninja.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/915544 +https://github.com/randombit/botan/commit/a1a32558669a6751e39420b26930d477790509ce + +From a1a32558669a6751e39420b26930d477790509ce Mon Sep 17 00:00:00 2001 +From: Jack Lloyd +Date: Wed, 11 Oct 2023 07:36:31 -0400 +Subject: [PATCH] Fix Ninja build to pass instruction set flags to the compiler + +Fixes #3750 +--- a/src/build-data/ninja.in ++++ b/src/build-data/ninja.in +@@ -161,6 +161,7 @@ build tidy: tidy + + %{for lib_build_info} + build %{obj}: compile_lib %{src} ++ isa_flags = %{isa_flags} + %{endfor} + + %{for cli_build_info} + -- cgit v1.2.3-65-gdbad