mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-10 14:36:58 +02:00
dev-libs/gmp: Sync with Gentoo
It's from Gentoo commit b94ba407279f795e4302935504fbcc4df2ed5644.
This commit is contained in:
parent
54c7847731
commit
584ced9f99
@ -1,4 +1,2 @@
|
|||||||
DIST gmp-6.2.1-arm64-darwin.patch.bz2 2520 BLAKE2B 3d4e9dbd29dc9aa81f0c9e0de4a5904c989d54148c9e3dcc5097a43b3fb1ecd17802dacfc71ee131c0805a345f5dce9009e88439758d3a0ed8b3a88526353b4a SHA512 72d49f09c3facd75036c945e076207e72e5673ba9605999c32a122e43e8b970ed646c8ca8f07acbb62bff5e7c387d4c8e1f73ca73e50ac3f574b5f6471d66d56
|
|
||||||
DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
|
|
||||||
DIST gmp-6.3.0.tar.xz 2094196 BLAKE2B a865129e2b3f634ec5bad7f97ed89532e43f5662ac47a7d8ab7f0df8c9f8d0886bd984651422e2573c2163bca69c0547c248147ec90880accbd53db97dc0ddee SHA512 e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2
|
DIST gmp-6.3.0.tar.xz 2094196 BLAKE2B a865129e2b3f634ec5bad7f97ed89532e43f5662ac47a7d8ab7f0df8c9f8d0886bd984651422e2573c2163bca69c0547c248147ec90880accbd53db97dc0ddee SHA512 e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2
|
||||||
DIST gmp-man-6.2.1.pdf 827583 BLAKE2B 9aa25457a3c488e37cc7d54d825253ab749a3780919570579b319cf607001de50b212ca387b70213abcc5ab428b4525bdb9cd8ae932798a2d7928da98ce3f353 SHA512 f2d9d02e97975355ef490e921fedc94fb7687c3661eec8fa2e94a1622b6e59b17b3879eb3ec1f2df8edac100f727175144d107f4c49c602b773c43bc9e91dbcb
|
DIST gmp-man-6.2.1.pdf 827583 BLAKE2B 9aa25457a3c488e37cc7d54d825253ab749a3780919570579b319cf607001de50b212ca387b70213abcc5ab428b4525bdb9cd8ae932798a2d7928da98ce3f353 SHA512 f2d9d02e97975355ef490e921fedc94fb7687c3661eec8fa2e94a1622b6e59b17b3879eb3ec1f2df8edac100f727175144d107f4c49c602b773c43bc9e91dbcb
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
https://bugs.gentoo.org/823804
|
|
||||||
https://gmplib.org/repo/gmp-6.2/rev/561a9c25298e
|
|
||||||
--- a/mpz/inp_raw.c
|
|
||||||
+++ b/mpz/inp_raw.c
|
|
||||||
@@ -88,8 +88,11 @@ mpz_inp_raw (mpz_ptr x, FILE *fp)
|
|
||||||
|
|
||||||
abs_csize = ABS (csize);
|
|
||||||
|
|
||||||
+ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8))
|
|
||||||
+ return 0; /* Bit size overflows */
|
|
||||||
+
|
|
||||||
/* round up to a multiple of limbs */
|
|
||||||
- abs_xsize = BITS_TO_LIMBS (abs_csize*8);
|
|
||||||
+ abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8);
|
|
||||||
|
|
||||||
if (abs_xsize != 0)
|
|
||||||
{
|
|
@ -1,182 +0,0 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
inherit gnuconfig libtool flag-o-matic multilib-minimal toolchain-funcs
|
|
||||||
|
|
||||||
MY_PV=${PV/_p*}
|
|
||||||
MY_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="
|
|
||||||
https://gmplib.org/download/gmp/${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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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() {
|
|
||||||
# Generally a very fragile package
|
|
||||||
strip-flags
|
|
||||||
# Miscompiled with LTO at least on arm64, bug #889948
|
|
||||||
filter-lto
|
|
||||||
|
|
||||||
# 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}/
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user