mirror of
https://github.com/flatcar/scripts.git
synced 2026-02-12 03:01:46 +01:00
dev-build/autoconf: Sync with Gentoo
It's from Gentoo commit 273de03c3cd6a1573a93473752f25c2c7dbdd4a7. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
parent
e4a9551765
commit
9bc3b607bc
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="${PV:0:3}"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ else
|
||||
https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz
|
||||
verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
|
||||
"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-m4 )"
|
||||
fi
|
||||
|
||||
@ -16,7 +16,7 @@ else
|
||||
#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
|
||||
|
||||
if ! [[ ${PV} == *_beta* ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
fi
|
||||
|
||||
@ -24,7 +24,7 @@ else
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
if ! [[ ${PV} == *_beta* ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
|
||||
|
||||
@ -29,7 +29,7 @@ else
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
|
||||
|
||||
@ -29,7 +29,7 @@ else
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
|
||||
|
||||
105
sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r6.ebuild
vendored
Normal file
105
sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r6.ebuild
vendored
Normal file
@ -0,0 +1,105 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
# Bumping notes:
|
||||
# * Remember to modify LAST_KNOWN_VER 'upstream' in dev-build/autoconf-wrapper
|
||||
# on new autoconf releases, as well as the dependency in RDEPEND below too.
|
||||
# * Update _WANT_AUTOCONF and _autoconf_atom case statement in autotools.eclass.
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
|
||||
inherit git-r3
|
||||
else
|
||||
# For _beta handling replace with real version number
|
||||
MY_PV="${PV}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/zackweinberg.asc
|
||||
inherit verify-sig
|
||||
|
||||
SRC_URI="
|
||||
mirror://gnu/${PN}/${MY_P}.tar.xz
|
||||
https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
|
||||
https://meyering.net/ac/${P}.tar.xz
|
||||
verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.xz.sig )
|
||||
"
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
|
||||
fi
|
||||
|
||||
inherit toolchain-autoconf multiprocessing
|
||||
|
||||
DESCRIPTION="Used to create autoconfiguration files"
|
||||
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="$(ver_cut 1-2)"
|
||||
|
||||
BDEPEND+="
|
||||
>=dev-lang/perl-5.10
|
||||
>=sys-devel/m4-1.4.16
|
||||
"
|
||||
RDEPEND="
|
||||
${BDEPEND}
|
||||
>=dev-build/autoconf-wrapper-20231224
|
||||
sys-devel/gnuconfig
|
||||
!~${CATEGORY}/${P}:2.5
|
||||
"
|
||||
[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.72-gettext-0.25-autoreconf-Invoke-autopoint-in-more-situations.patch
|
||||
"${FILESDIR}"/${PN}-2.72-gettext-0.25-autoreconf-Adapt-to-the-on-disk-situation-after-auto.patch
|
||||
"${FILESDIR}"/${PN}-2.72-Port-C11-test-to-C-20.patch
|
||||
"${FILESDIR}"/${PN}-2.72-Port-AC_SYS_LARGEFILE-to-CXX.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
# Avoid the "dirty" suffix in the git version by generating it
|
||||
# before we run later stages which might modify source files.
|
||||
local ver=$(./build-aux/git-version-gen .tarball-version)
|
||||
echo "${ver}" > .tarball-version || die
|
||||
|
||||
autoreconf -f -i || die
|
||||
fi
|
||||
|
||||
# usr/bin/libtool is provided by binutils-apple, need gnu libtool
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
|
||||
fi
|
||||
|
||||
# Save timestamp to avoid later makeinfo call
|
||||
touch -r doc/{,old_}autoconf.texi || die
|
||||
|
||||
toolchain-autoconf_src_prepare
|
||||
|
||||
# Restore timestamp to avoid makeinfo call
|
||||
# We already have an up to date autoconf.info page at this point.
|
||||
touch -r doc/{old_,}autoconf.texi || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
toolchain-autoconf_src_install
|
||||
|
||||
# dissuade Portage from removing our dir file
|
||||
touch "${ED}"/usr/share/${P}/info/.keepinfodir || die
|
||||
|
||||
local f
|
||||
for f in config.{guess,sub} ; do
|
||||
ln -fs ../../gnuconfig/${f} \
|
||||
"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
|
||||
done
|
||||
}
|
||||
@ -29,7 +29,7 @@ else
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
|
||||
|
||||
@ -0,0 +1,87 @@
|
||||
From b71143738516017f0e0d347a4025301c06c40254 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Wed, 24 Apr 2024 14:47:56 -0700
|
||||
Subject: Port AC_SYS_LARGEFILE to C++
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Problem reported by Zack Weinberg
|
||||
<https://savannah.gnu.org/support/?110983>.
|
||||
* lib/autoconf/specific.m4 (_AC_SYS_YEAR2038_PROBE)
|
||||
(_AC_SYS_LARGEFILE_PROBE):
|
||||
In chatter, say it’s a CPPFLAGS option, not a CC option.
|
||||
(_AC_SYS_LARGEFILE_OPTIONS): Omit -n32, as we no longer
|
||||
need to worry about IRIX.
|
||||
(_AC_SYS_LARGEFILE_PROBE): Fiddle with CPPFLAGS, not CC,
|
||||
and don’t worry about -n32.
|
||||
---
|
||||
lib/autoconf/specific.m4 | 18 +++++++-----------
|
||||
1 file changed, 7 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
|
||||
index a0e1fa8d..0d0191a8 100644
|
||||
--- a/lib/autoconf/specific.m4
|
||||
+++ b/lib/autoconf/specific.m4
|
||||
@@ -132,7 +132,7 @@ m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize(
|
||||
# If you change this macro you may also need to change
|
||||
# _AC_SYS_YEAR2038_OPTIONS.
|
||||
AC_DEFUN([_AC_SYS_YEAR2038_PROBE],
|
||||
-[AC_CACHE_CHECK([for $CC option for timestamps after 2038],
|
||||
+[AC_CACHE_CHECK([for $CPPFLAGS option for timestamps after 2038],
|
||||
[ac_cv_sys_year2038_opts],
|
||||
[ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
ac_opt_found=no
|
||||
@@ -262,7 +262,6 @@ m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize(
|
||||
["none needed"] dnl Most current systems
|
||||
["-D_FILE_OFFSET_BITS=64"] dnl X/Open LFS spec
|
||||
["-D_LARGE_FILES=1"] dnl 32-bit AIX 4.2.1+, 32-bit z/OS
|
||||
- ["-n32"] dnl 32-bit IRIX 6, SGI cc (obsolete)
|
||||
))
|
||||
|
||||
# _AC_SYS_LARGEFILE_PROBE
|
||||
@@ -279,25 +278,25 @@ m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize(
|
||||
# If you change this macro you may also need to change
|
||||
# _AC_SYS_LARGEFILE_OPTIONS.
|
||||
AC_DEFUN([_AC_SYS_LARGEFILE_PROBE],
|
||||
-[AC_CACHE_CHECK([for $CC option to enable large file support],
|
||||
+[AC_CACHE_CHECK([for $CPPFLAGS option for large files],
|
||||
[ac_cv_sys_largefile_opts],
|
||||
- [ac_save_CC="$CC"
|
||||
+ [ac_save_CPPFLAGS=$CPPFLAGS
|
||||
ac_opt_found=no
|
||||
for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do
|
||||
AS_IF([test x"$ac_opt" != x"none needed"],
|
||||
- [CC="$ac_save_CC $ac_opt"])
|
||||
+ [CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"])
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])],
|
||||
[AS_IF([test x"$ac_opt" = x"none needed"],
|
||||
[# GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t.
|
||||
- CC="$CC -DFTYPE=ino_t"
|
||||
+ CPPFLAGS="$CPPFLAGS -DFTYPE=ino_t"
|
||||
AC_COMPILE_IFELSE([], [],
|
||||
- [CC="$CC -D_FILE_OFFSET_BITS=64"
|
||||
+ [CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
|
||||
AC_COMPILE_IFELSE([], [ac_opt='-D_FILE_OFFSET_BITS=64'])])])
|
||||
ac_cv_sys_largefile_opts=$ac_opt
|
||||
ac_opt_found=yes])
|
||||
test $ac_opt_found = no || break
|
||||
done
|
||||
- CC="$ac_save_CC"
|
||||
+ CPPFLAGS=$ac_save_CPPFLAGS
|
||||
dnl Gnulib implements large file support for native Windows, based on the
|
||||
dnl variables WINDOWS_64_BIT_OFF_T, WINDOWS_64_BIT_ST_SIZE.
|
||||
m4_ifdef([gl_LARGEFILE], [
|
||||
@@ -327,9 +326,6 @@ AS_CASE([$ac_cv_sys_largefile_opts],
|
||||
[AC_DEFINE([_LARGE_FILES], [1],
|
||||
[Define to 1 on platforms where this makes off_t a 64-bit type.])],
|
||||
|
||||
- ["-n32"],
|
||||
- [CC="$CC -n32"],
|
||||
-
|
||||
[AC_MSG_ERROR(
|
||||
[internal error: bad value for \$ac_cv_sys_largefile_opts])])
|
||||
|
||||
--
|
||||
cgit v1.2.3
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From e6c9cb69c8c0a4ef9ce0538d7b4106dad3d7ad47 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Sun, 26 May 2024 07:04:19 -0700
|
||||
Subject: [PATCH] Port C11 test to C++20
|
||||
|
||||
Trivial fix suggested by Peter Johansson in:
|
||||
https://lists.gnu.org/r/autoconf/2024-05/msg00004.html
|
||||
* lib/autoconf/c.m4 (_AC_CXX_CXX11_TEST_MAIN):
|
||||
Do not test assigning u8"..." to char const *, as this
|
||||
runs afoul of C++20.
|
||||
---
|
||||
lib/autoconf/c.m4 | 3 +--
|
||||
1 files changed, 1 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
|
||||
index d4f7fbe..673d62e 100644
|
||||
--- a/lib/autoconf/c.m4
|
||||
+++ b/lib/autoconf/c.m4
|
||||
@@ -2638,8 +2638,7 @@ ac_cxx_conftest_cxx11_main='
|
||||
test_template<::test_template<int>> v(test_template<int>(12));
|
||||
}
|
||||
{
|
||||
- // Unicode literals
|
||||
- char const *utf8 = u8"UTF-8 string \u2500";
|
||||
+ // Unicode literals. Do not test u8"..." as C++20 would reject it.
|
||||
char16_t const *utf16 = u"UTF-8 string \u2500";
|
||||
char32_t const *utf32 = U"UTF-32 string \u2500";
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user