From 2e58af672b41a624f84eb7fada145ab2f6c2b1b6 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 6 Dec 2022 10:48:07 +0000 Subject: dev-libs/gmp: further econf fixes * Use gnuconfig.eclass to update configfsf.{guess,sub} before the wrapped versions call them. * Export CBUILD too just in case for the deduced host from upstream's wrapped config.guess (not the same as gnuconfig's at all, see bugs for details). * Save/restore upstream's config.{guess,sub} to make sure that for the second multilib build we still have it available to run. In practice, this may not have mattered too much, as the exported ac_cv_host should've persisted, but it's still worth being (clearly) correct as is the case now. * Move cpudetection warning into pkg_pretend so it's easier to spot and we also don't then repeat it for each ABI. Bug: https://bugs.gentoo.org/235697 Bug: https://bugs.gentoo.org/545442 Bug: https://bugs.gentoo.org/883201 See: 78b4d4ebbcee12f5ef4c1dfa89f80c98a582db9d See: 3fe1b5370c0cc1537d1249e8ec9d2fbcd8619499 See: bf286a7973d8b95dbef90f17cc8e2d66c19a47c8 See: 121152c38caefd8e94fb8c90cb51102693b6d6a8 Signed-off-by: Sam James --- dev-libs/gmp/gmp-6.2.1-r4.ebuild | 156 ---------------------------------- dev-libs/gmp/gmp-6.2.1-r5.ebuild | 176 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 156 deletions(-) delete mode 100644 dev-libs/gmp/gmp-6.2.1-r4.ebuild create mode 100644 dev-libs/gmp/gmp-6.2.1-r5.ebuild diff --git a/dev-libs/gmp/gmp-6.2.1-r4.ebuild b/dev-libs/gmp/gmp-6.2.1-r4.ebuild deleted file mode 100644 index 0a58fc8ba3b4..000000000000 --- a/dev-libs/gmp/gmp-6.2.1-r4.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit libtool multilib-minimal toolchain-funcs - -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} - -MANUAL_PV=${MY_PV} -MANUAL_PV=6.2.1 - -MY_P=${PN}-${MY_PV} -PLEVEL=${PV/*p} - -DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers" -HOMEPAGE="https://gmplib.org/" -SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz - mirror://gnu/${PN}/${MY_P}.tar.xz - doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf )" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-arm64-darwin.patch.bz2" -S="${WORKDIR}"/${MY_P%a} - -LICENSE="|| ( LGPL-3+ GPL-2+ )" -# The subslot reflects the C & C++ SONAMEs. -SLOT="0/10.4" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+asm doc +cpudetection +cxx pic static-libs" -REQUIRED_USE="cpudetection? ( asm )" -RESTRICT="!cpudetection? ( bindist )" - -BDEPEND=" - app-arch/xz-utils - sys-devel/m4 -" - -DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache ) -HTML_DOCS=( doc ) - -MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch - "${FILESDIR}"/${PN}-6.2.1-no-zarch.patch - "${WORKDIR}"/${P}-arm64-darwin.patch - "${FILESDIR}"/${P}-CVE-2021-43618.patch -) - -src_prepare() { - default - - # We cannot run autotools here as gcc depends on this package - elibtoolize - - # bug #536894 - if [[ ${CHOST} == *-darwin* ]] ; then - eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch - fi - - # GMP uses the "ABI" env var during configure as does Gentoo (econf). - # So, to avoid patching the source constantly, wrap things up. - mv configure configure.wrapped || die - cat <<-\EOF > configure - #!/usr/bin/env sh - exec env ABI="${GMPABI}" "$0.wrapped" "$@" - EOF - - # Patches to original configure might have lost the +x bit. - chmod a+rx configure{,.wrapped} || die -} - -multilib_src_configure() { - # Because of our 32-bit userland, 1.0 is the only HPPA ABI that works - # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613) - if [[ ${CHOST} == hppa2.0-* ]] ; then - GMPABI="1.0" - fi - - # ABI mappings (needs all architectures supported) - case ${ABI} in - 32|x86) GMPABI=32;; - 64|amd64|n64) GMPABI=64;; - [onx]32) GMPABI=${ABI};; - esac - export GMPABI - - tc-export CC - - # https://gmplib.org/manual/Notes-for-Package-Builds - local myeconfargs=( - CC_FOR_BUILD="$(tc-getBUILD_CC)" - - --localstatedir="${EPREFIX}"/var/state/gmp - --enable-shared - - $(use_enable asm assembly) - # fat is needed to avoid gmp installing either purely generic - # or specific-to-used-CPU (which our config.guess refresh prevents at the moment). - # Both Fedora and opensuse use this option to tackle the issue, bug #883201. - # - # This only works for amd64/x86, so to get accelerated performance - # (i.e. not using the generic C), one needs USE=-cpudetection if - # on non-amd64/x86. - # - # (We do not mask USE=cpudetection on !amd64/x86 because we want - # the flag to be useful on other arches to allow opting out of the - # config.guess logic below.) - $(use_enable cpudetection fat) - $(use_enable cxx) - $(use_enable static-libs static) - - # --with-pic forces static libraries to be built as PIC - # and without TEXTRELs. musl does not support TEXTRELs: bug #707332 - $(use pic && echo --with-pic) - ) - - if use cpudetection && ! use amd64 && ! use x86 ; then - elog "Using generic C implementation on non-amd64/x86 with USE=cpudetection" - elog "--enable-fat is a no-op on alternative arches." - elog "To obtain an optimized build, set USE=-cpudetection, but binpkgs should not then be made." - fi - - # See bug #883201 again. - if ! use cpudetection && ! tc-is-cross-compiler ; then - local gmp_host=$("${S}"/config.guess || die "failed to run config.guess") - - if [[ -z ${gmp_host} ]] ; then - die "Empty result from GMP's custom config.guess!" - fi - - einfo "GMP guessed processor type: ${gmp_host}" - ewarn "This build will only work on this machine. Enable USE=cpudetection for binary packages!" - export ac_cv_host="${gmp_host}" - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - # Should be a standalone lib - rm -f "${ED}"/usr/$(get_libdir)/libgmp.la - - # This requires libgmp - local la="${ED}/usr/$(get_libdir)/libgmpxx.la" - if ! use static-libs ; then - rm -f "${la}" || die - fi -} - -multilib_src_install_all() { - einstalldocs - use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/ -} diff --git a/dev-libs/gmp/gmp-6.2.1-r5.ebuild b/dev-libs/gmp/gmp-6.2.1-r5.ebuild new file mode 100644 index 000000000000..2e867d0047e9 --- /dev/null +++ b/dev-libs/gmp/gmp-6.2.1-r5.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnuconfig libtool multilib-minimal toolchain-funcs + +MY_PV=${PV/_p*} +MY_PV=${MY_PV/_/-} + +MANUAL_PV=${MY_PV} +MANUAL_PV=6.2.1 + +MY_P=${PN}-${MY_PV} +PLEVEL=${PV/*p} + +DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers" +HOMEPAGE="https://gmplib.org/" +SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz + mirror://gnu/${PN}/${MY_P}.tar.xz + doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf )" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-arm64-darwin.patch.bz2" +S="${WORKDIR}"/${MY_P%a} + +LICENSE="|| ( LGPL-3+ GPL-2+ )" +# The subslot reflects the C & C++ SONAMEs. +SLOT="0/10.4" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+asm doc +cpudetection +cxx pic static-libs" +REQUIRED_USE="cpudetection? ( asm )" +RESTRICT="!cpudetection? ( bindist )" + +BDEPEND=" + app-arch/xz-utils + sys-devel/m4 +" + +DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache ) +HTML_DOCS=( doc ) + +MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h ) + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch + "${FILESDIR}"/${PN}-6.2.1-no-zarch.patch + "${WORKDIR}"/${P}-arm64-darwin.patch + "${FILESDIR}"/${P}-CVE-2021-43618.patch +) + +pkg_pretend() { + if use cpudetection && ! use amd64 && ! use x86 ; then + elog "Using generic C implementation on non-amd64/x86 with USE=cpudetection" + elog "--enable-fat is a no-op on alternative arches." + elog "To obtain an optimized build, set USE=-cpudetection, but binpkgs should not then be made." + fi +} + +src_prepare() { + default + + # We cannot run autotools here as gcc depends on this package + elibtoolize + + # bug #536894 + if [[ ${CHOST} == *-darwin* ]] ; then + eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch + fi + + # GMP uses the "ABI" env var during configure as does Gentoo (econf). + # So, to avoid patching the source constantly, wrap things up. + mv configure configure.wrapped || die + cat <<-\EOF > configure + #!/usr/bin/env sh + exec env ABI="${GMPABI}" "$0.wrapped" "$@" + EOF + + # Patches to original configure might have lost the +x bit. + chmod a+rx configure{,.wrapped} || die + + # Save the upstream files named config.{guess,sub} which are + # wrappers around the gnuconfig versions. + mkdir "${T}"/gmp-gnuconfig || die + mv config.guess "${T}"/gmp-gnuconfig/config.guess || die + mv config.sub "${T}"/gmp-gnuconfig/config.sub || die + # Grab fresh copies from gnuconfig. + touch config.guess config.sub || die + gnuconfig_update + # Rename the fresh copies to the filenames the wrappers from GMP + # expect. + mv config.guess configfsf.guess || die + mv config.sub configfsf.sub || die +} + +multilib_src_configure() { + # Because of our 32-bit userland, 1.0 is the only HPPA ABI that works + # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613) + if [[ ${CHOST} == hppa2.0-* ]] ; then + GMPABI="1.0" + fi + + # ABI mappings (needs all architectures supported) + case ${ABI} in + 32|x86) GMPABI=32;; + 64|amd64|n64) GMPABI=64;; + [onx]32) GMPABI=${ABI};; + esac + export GMPABI + + tc-export CC + + # https://gmplib.org/manual/Notes-for-Package-Builds + local myeconfargs=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + + --localstatedir="${EPREFIX}"/var/state/gmp + --enable-shared + + $(use_enable asm assembly) + # fat is needed to avoid gmp installing either purely generic + # or specific-to-used-CPU (which our config.guess refresh prevents at the moment). + # Both Fedora and opensuse use this option to tackle the issue, bug #883201. + # + # This only works for amd64/x86, so to get accelerated performance + # (i.e. not using the generic C), one needs USE=-cpudetection if + # on non-amd64/x86. + # + # (We do not mask USE=cpudetection on !amd64/x86 because we want + # the flag to be useful on other arches to allow opting out of the + # config.guess logic below.) + $(use_enable cpudetection fat) + $(use_enable cxx) + $(use_enable static-libs static) + + # --with-pic forces static libraries to be built as PIC + # and without TEXTRELs. musl does not support TEXTRELs: bug #707332 + $(use pic && echo --with-pic) + ) + + # Move the wrappers from GMP back into place (may have been destroyed by previous econf run) + cp "${T}"/gmp-gnuconfig/config.guess "${S}"/config.guess || die + cp "${T}"/gmp-gnuconfig/config.sub "${S}"/config.sub || die + + # See bug #883201 again. + if ! use cpudetection && ! tc-is-cross-compiler ; then + local gmp_host=$("${S}"/config.guess || die "failed to run config.guess") + + if [[ -z ${gmp_host} ]] ; then + die "Empty result from GMP's custom config.guess!" + fi + + einfo "GMP guessed processor type: ${gmp_host}" + ewarn "This build will only work on this machine. Enable USE=cpudetection for binary packages!" + export ac_cv_build="${gmp_host}" + export ac_cv_host="${gmp_host}" + fi + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + # Should be a standalone lib + rm -f "${ED}"/usr/$(get_libdir)/libgmp.la + + # This requires libgmp + local la="${ED}/usr/$(get_libdir)/libgmpxx.la" + if ! use static-libs ; then + rm -f "${la}" || die + fi +} + +multilib_src_install_all() { + einstalldocs + use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/ +} -- cgit v1.2.3-65-gdbad