* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/
@ 2018-02-26 22:40 Thomas Deutschmann
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Deutschmann @ 2018-02-26 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 4a74793ea13cc10625c474997bdca1e3c0a7652e
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 22:35:58 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 22:40:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a74793e
sys-devel/automake: Rev bump to fix AM_PATH_PYTHON macro
Closes: https://bugs.gentoo.org/648846
Package-Manager: Portage-2.3.24, Repoman-2.3.6
...utomake-1.16.ebuild => automake-1.16-r1.ebuild} | 5 ++-
.../files/automake-1.16-fix-AM_PATH_PYTHON.patch | 36 ++++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/sys-devel/automake/automake-1.16.ebuild b/sys-devel/automake/automake-1.16-r1.ebuild
similarity index 95%
rename from sys-devel/automake/automake-1.16.ebuild
rename to sys-devel/automake/automake-1.16-r1.ebuild
index 3add6f0127e..65ef083500f 100644
--- a/sys-devel/automake/automake-1.16.ebuild
+++ b/sys-devel/automake/automake-1.16-r1.ebuild
@@ -42,7 +42,10 @@ DEPEND="${RDEPEND}
sys-apps/help2man
test? ( ${PYTHON_DEPS} )"
-PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch
+ "${FILESDIR}"/${PN}-1.16-fix-AM_PATH_PYTHON.patch
+)
src_prepare() {
default
diff --git a/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch b/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch
new file mode 100644
index 00000000000..146496d6dfd
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch
@@ -0,0 +1,36 @@
+bug#30616: automake-1.16: aclocal is unable to process AM_PATH_PYTHON with variable as value
+
+http://lists.gnu.org/archive/html/bug-automake/2018-02/msg00012.html
+
+--- a/m4/python.m4
++++ b/m4/python.m4
+@@ -36,24 +36,12 @@ AC_DEFUN([AM_PATH_PYTHON],
+ [
+ dnl Find a Python interpreter. Python versions prior to 2.0 are not
+ dnl supported. (2.0 was released on October 16, 2000).
+- m4_define_default([am_py_min_ver], m4_ifval([$1], [$1], [2.0]))
+- dnl The arbitrary default maximum version.
+- m4_define_default([am_py_max_ver], [4.0])
+-
++ dnl FIXME: Remove the need to hard-code Python versions here.
+ m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+- [[python] \
+- dnl If we want some Python 2 versions (min version <= 2.7),
+- dnl also search for "python2".
+- m4_if(m4_version_compare(am_py_min_ver, [2.8]), [-1], [python2], []) \
+- [python3] \
+- dnl Construct a comma-separated list of interpreter names (python2.6,
+- dnl python2.7, etc). We only care about the first 3 characters of the
+- dnl version strings (major-dot-minor; not
+- dnl major-dot-minor-dot-bugfix[-dot-whatever])
+- m4_foreach([py_ver],
+- m4_esyscmd_s(seq -s[[", "]] -f["[[%.1f]]"] m4_substr(am_py_max_ver, [0], [3]) -0.1 m4_substr(am_py_min_ver, [0], [3])),
+- dnl Remove python2.8 and python2.9 since they will never exist
+- [m4_bmatch(py_ver, [2.[89]], [], [python]py_ver)])])
++[python python2 python3 python3.9 python3.8 python3.7 python3.6 dnl
++ python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 dnl
++ python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
++ python2.1 python2.0])
+
+ AC_ARG_VAR([PYTHON], [the Python interpreter])
+
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/
@ 2019-11-08 9:47 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2019-11-08 9:47 UTC (permalink / raw
To: gentoo-commits
commit: c8a9593ce34635069bcff01b564f4233aebd79b0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 3 11:02:30 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 09:47:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a9593c
sys-devel/automake: Fix byte-compiling Python modules on py3.5+
Bug: https://bugs.gentoo.org/699218
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-devel/automake/automake-1.16.1-r2.ebuild | 113 +++++++++++++++++++++
.../files/automake-1.16.1-py3-compile.patch | 61 +++++++++++
2 files changed, 174 insertions(+)
diff --git a/sys-devel/automake/automake-1.16.1-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild
new file mode 100644
index 00000000000..963d7cd4783
--- /dev/null
+++ b/sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 versionator
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
+
+ inherit git-r3
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ if [[ ${PV/_beta} == ${PV} ]]; then
+ MY_P=${P}
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+ https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+ else
+ MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
+ MY_P="${PN}-${MY_PV}"
+
+ # Alpha/beta releases are not distributed on the usual mirrors.
+ SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+ fi
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="https://www.gnu.org/software/automake/"
+
+LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/perl
+ >=sys-devel/automake-wrapper-11
+ >=sys-devel/autoconf-2.69:*
+ sys-devel/gnuconfig"
+DEPEND="${RDEPEND}
+ sys-apps/help2man
+ test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+ "${FILESDIR}"/automake-1.16.1-py3-compile.patch
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ export WANT_AUTOCONF=2.5
+ # Don't try wrapping the autotools this thing runs as it tends
+ # to be a bit esoteric, and the script does `set -e` itself.
+ ./bootstrap || die
+ sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+
+ # Bug 628912
+ if ! has_version sys-apps/texinfo ; then
+ touch doc/{stamp-vti,version.texi,automake.info} || die
+ fi
+}
+
+# slot the info pages. do this w/out munging the source so we don't have
+# to depend on texinfo to regen things. #464146 (among others)
+slot_info_pages() {
+ pushd "${ED%/}"/usr/share/info >/dev/null || die
+ rm -f dir || die
+
+ # Rewrite all the references to other pages.
+ # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4.
+ # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4.
+ local p pages=( *.info ) args=()
+ for p in "${pages[@]/%.info}" ; do
+ args+=(
+ -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+ -e "s:(${p}):(${p}-${SLOT}):g"
+ )
+ done
+ sed -i "${args[@]}" * || die
+
+ # Rewrite all the file references, and rename them in the process.
+ local f d
+ for f in * ; do
+ d=${f/.info/-${SLOT}.info}
+ mv "${f}" "${d}" || die
+ sed -i -e "s:${f}:${d}:g" * || die
+ done
+
+ popd >/dev/null || die
+}
+
+src_install() {
+ default
+
+ slot_info_pages
+ rm "${ED%/}"/usr/share/aclocal/README || die
+ rmdir "${ED%/}"/usr/share/aclocal || die
+ rm \
+ "${ED%/}"/usr/bin/{aclocal,automake} \
+ "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die
+
+ # remove all config.guess and config.sub files replacing them
+ # w/a symlink to a specific gnuconfig version
+ local x
+ for x in guess sub ; do
+ dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+ done
+}
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-compile.patch b/sys-devel/automake/files/automake-1.16.1-py3-compile.patch
new file mode 100644
index 00000000000..bbb08454763
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.1-py3-compile.patch
@@ -0,0 +1,61 @@
+From d3edb7e0f3a5553b1ed919e566ec8c41022251a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 3 Nov 2019 11:51:19 +0100
+Subject: [PATCH] py-compile: Support -OO for py3.5+, and -O&-OO for pypy3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ lib/py-compile | 27 +++++++++++++++++++++++++--
+ 1 file changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/lib/py-compile b/lib/py-compile
+index 1a3f4d644..44be97fc4 100755
+--- a/lib/py-compile
++++ b/lib/py-compile
+@@ -140,7 +140,7 @@ $PYTHON -O -c "
+ import sys, os, py_compile, imp
+
+ # pypy does not use .pyo optimization
+-if hasattr(sys, 'pypy_translation_info'):
++if hasattr(sys, 'pypy_translation_info') and sys.hexversion < 0x03050000:
+ sys.exit(0)
+
+ files = '''$files'''
+@@ -154,7 +154,30 @@ for file in files.split():
+ sys.stdout.write(file)
+ sys.stdout.flush()
+ if hasattr(imp, 'get_tag'):
+- py_compile.compile(filepath, imp.cache_from_source(filepath, False), path)
++ py_compile.compile(filepath, imp.cache_from_source(filepath), path)
++ else:
++ py_compile.compile(filepath, filepath + 'o', path)
++sys.stdout.write('\n')" 2>/dev/null || :
++
++$PYTHON -OO -c "
++import sys, os, py_compile, imp
++
++# python<3.5 does not have split files for -O and -OO
++if sys.hexversion < 0x03050000:
++ sys.exit(0)
++
++files = '''$files'''
++sys.stdout.write('Byte-compiling python modules (-OO versions) ...\n')
++for file in files.split():
++ $pathtrans
++ $filetrans
++ if not os.path.exists(filepath) or not (len(filepath) >= 3
++ and filepath[-3:] == '.py'):
++ continue
++ sys.stdout.write(file)
++ sys.stdout.flush()
++ if hasattr(imp, 'get_tag'):
++ py_compile.compile(filepath, imp.cache_from_source(filepath), path)
+ else:
+ py_compile.compile(filepath, filepath + 'o', path)
+ sys.stdout.write('\n')" 2>/dev/null || :
+--
+2.23.0
+
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/
@ 2020-01-20 5:04 Andreas K. Hüttel
0 siblings, 0 replies; 8+ messages in thread
From: Andreas K. Hüttel @ 2020-01-20 5:04 UTC (permalink / raw
To: gentoo-commits
commit: 23577f272c86fe7c44c684b3366f63f8fe1cf04f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 19 04:24:03 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 05:04:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23577f27
sys-devel/automake: Fix remaining tests broken with py3
Bug: https://bugs.gentoo.org/705514
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sys-devel/automake/automake-1.16.1-r2.ebuild | 4 +++
sys-devel/automake/automake-9999.ebuild | 4 +++
.../files/automake-1.16.1-py3-compile-test.patch | 12 +++++++
.../automake-1.16.1-py3-pep3147-cmdline.patch | 16 +++++++++
.../files/automake-1.16.1-py3-pep3147.patch | 39 ++++++++++++++++++++++
5 files changed, 75 insertions(+)
diff --git a/sys-devel/automake/automake-1.16.1-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild
index c483767b582..d18df7f0675 100644
--- a/sys-devel/automake/automake-1.16.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -49,7 +49,11 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/automake-1.16.1-py3-compile.patch
"${FILESDIR}"/automake-1.16.1-py3-no-pyo-files.patch
+ "${FILESDIR}"/automake-1.16.1-py3-pep3147.patch
+ "${FILESDIR}"/automake-1.16.1-py3-pep3147-cmdline.patch
+ "${FILESDIR}"/automake-1.16.1-py3-compile-test.patch
)
+# All three patches have been submitted upstream and ignored there.
pkg_setup() {
use test && python-any-r1_pkg_setup
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index c483767b582..d18df7f0675 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -49,7 +49,11 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/automake-1.16.1-py3-compile.patch
"${FILESDIR}"/automake-1.16.1-py3-no-pyo-files.patch
+ "${FILESDIR}"/automake-1.16.1-py3-pep3147.patch
+ "${FILESDIR}"/automake-1.16.1-py3-pep3147-cmdline.patch
+ "${FILESDIR}"/automake-1.16.1-py3-compile-test.patch
)
+# All three patches have been submitted upstream and ignored there.
pkg_setup() {
use test && python-any-r1_pkg_setup
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch b/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch
new file mode 100644
index 00000000000..bd5a6759c29
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch
@@ -0,0 +1,12 @@
+diff -ruN automake-1.16.1.orig/t/py-compile-basedir.sh automake-1.16.1/t/py-compile-basedir.sh
+--- automake-1.16.1.orig/t/py-compile-basedir.sh 2020-01-20 05:07:12.915260159 +0100
++++ automake-1.16.1/t/py-compile-basedir.sh 2020-01-20 05:07:45.827074984 +0100
+@@ -42,7 +42,7 @@
+ py_installed "$d2/$f.pyc"
+ py_installed "$d2/sub/$f.pyc"
+ files=$(find "$d2" | grep '\.py[co]$')
+- test $(echo "$files" | wc -l) -eq 4
++ test $(echo "$files" | wc -l) -eq 4 -o $(echo "$files" | wc -l) -eq 6
+ case $d2 in
+ .|..) rm -f $files;;
+ *) rm -rf "$d2";;
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch b/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch
new file mode 100644
index 00000000000..7ece18ebc30
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch
@@ -0,0 +1,16 @@
+diff -ruN automake-1.16.1.orig/t/instmany-python.sh automake-1.16.1/t/instmany-python.sh
+--- automake-1.16.1.orig/t/instmany-python.sh 2018-02-26 21:38:28.000000000 +0100
++++ automake-1.16.1/t/instmany-python.sh 2020-01-20 02:44:37.192352310 +0100
+@@ -21,7 +21,11 @@
+ required='python'
+ . test-init.sh
+
+-limit=2500
++limit=3200
++# Let's increase the number here a bit, otherwise the __pycache__ dirs
++# make the test fail. I know this is a hack, but does anything conform
++# to the POSIX limit of 4096 still anyway?
++
+ subdir=long_subdir_name_with_many_characters
+ nfiles=81
+ list=$(seq_ 1 $nfiles)
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch b/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch
new file mode 100644
index 00000000000..545544d89fe
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch
@@ -0,0 +1,39 @@
+From: Lukas Fleischer
+Subject: python: Properly uninstall __pycache__ in subdirectories
+Date: Sun, 20 May 2018 17:28:51 +0200
+
+When uninstalling __pycache__ files in a subdirectory "sub", the
+Makefile incorrectly removed the files from __pycache__/sub/ instead of
+sub/__pycache__/.
+
+* lib/am/python.am (uninstall-%DIR%PYTHON): Use the correct path when
+uninstalling byte-compiled files installed in '__pycache__'
+subdirectories.
+
+Source: https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00000.html
+Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ lib/am/python.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff -ruN automake-1.16.1.orig/lib/am/python.am automake-1.16.1/lib/am/python.am
+--- automake-1.16.1.orig/lib/am/python.am 2018-02-26 21:38:27.000000000 +0100
++++ automake-1.16.1/lib/am/python.am 2020-01-19 05:35:01.212177206 +0100
+@@ -97,7 +97,7 @@
+ if %?INSTALL%
+
+ ?FIRST?am__pep3147_tweak = \
+-?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|'
++?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc\n__pycache__/&.*.pyo|'
+
+ .PHONY uninstall-am: uninstall-%DIR%PYTHON
+ uninstall-%DIR%PYTHON:
+@@ -116,7 +116,7 @@
+ done; \
+ ## This is somewhat tricky, because for newer pythons we have to take PEP-3147
+ ## into account. Avoid exceeding the command-line length limit.
+- dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \
++ dir='$(DESTDIR)$(%NDIR%dir)'; \
+ echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \
+ while read files; do \
+ $(am__uninstall_files_from_dir) || st=$$?; \
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/
@ 2020-03-22 13:03 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2020-03-22 13:03 UTC (permalink / raw
To: gentoo-commits
commit: 6c5f8aa11dc4a58a0d9a55fc4ae2fe45b7c3b4cf
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 13:01:51 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 13:03:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5f8aa1
sys-devel/automake: Bump to version 1.16.2
Thanks-to: Michał Górny <mgorny <AT> gentoo.org>
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-devel/automake/Manifest | 1 +
sys-devel/automake/automake-1.16.2.ebuild | 124 +++++++++++++++++++++
.../files/automake-1.16.2-py3-compile.patch | 73 ++++++++++++
3 files changed, 198 insertions(+)
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index abbe0d83c4f..f32953b5b1c 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -5,6 +5,7 @@ DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1
DIST automake-1.14.1.tar.xz 1488984 BLAKE2B a4c9b1f2c5ca35fba62e57423be2b6c060c63df8198d06a904a236745053072cb14ca4b333fb6cf370ef73378ee8771f4c10bcc111dcbd69e40f75abc16475fa SHA512 5de971159dfca2ec74c3c9a2f1368331efc437b146d675740c8735fcb0d32a30d0560fd29df64c3279efdf9278152c82a9ff09040b3e64d84743aaf25b26ce69
DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
DIST automake-1.16.1.tar.xz 1534936 BLAKE2B 0a3b42375361ff3c07e861eb2974fa094f8e76e4c6fcad02d6413402d201506b1cd660a187ffa1d2b29d8955ef60088f7b07d96405d803895b593b35b78f443a SHA512 4013bd31f4903b10875caa7d6ac16a14623a4eb91aa758924dee5b990e234fb50848d131e2dbdbbbc32f89c41a14f9c52a0064c37aa6760c524d607b354b13c3
+DIST automake-1.16.2.tar.xz 1545912 BLAKE2B 88e12fc7792c1a3a9c3b9095760145c2ebf3799602320efe5885a0cac16ced2cfb95865abf0a96b6969aa4652eb2b3d2ac8dae550d721392be45fc10c2458b67 SHA512 a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b
DIST automake-1.4-p6.tar.gz 375060 BLAKE2B 681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69 SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e
DIST automake-1.5.tar.gz 526934 BLAKE2B 4b613c81f933d550cc9e5e40dd9ce1160f49c388f4e9292b1a8843b0f4cfc57d72a3dc10bce03260cffa61ab8d67a5b27d781bd7a4c2d842764135158dc2b54f SHA512 b9dbece18935b6c08f7d17c456b0359a17362dc030692629cf5d66db675e46a5f24d60dfd20a50780e4096163454f1922d4281c4bb7af336d61e527b579e3bfc
DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c631375898568b442cc5d3561a618ad3f15b6103f55539487dcbf4088a6f75887dce5d00851bc4c09c5db45012d6bc2f1 SHA512 8407ea7d51a238622326d89c22777050c2a49d456e3e33c53985f40e4108094ef149693568d926cd1e9b2ddbdb5693c0d0ec6220e0f7bbae4341b6be9f0d060f
diff --git a/sys-devel/automake/automake-1.16.2.ebuild b/sys-devel/automake/automake-1.16.2.ebuild
new file mode 100644
index 00000000000..eec850ff724
--- /dev/null
+++ b/sys-devel/automake/automake-1.16.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit python-any-r1
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
+
+ inherit git-r3
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ if [[ ${PV/_beta} == ${PV} ]]; then
+ MY_P="${P}"
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+ https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+ else
+ MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
+ MY_P="${PN}-${MY_PV}"
+
+ # Alpha/beta releases are not distributed on the usual mirrors.
+ SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+ fi
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="https://www.gnu.org/software/automake/"
+
+LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/perl
+ >=sys-devel/automake-wrapper-11
+ >=sys-devel/autoconf-2.69:*
+ sys-devel/gnuconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-arch/gzip
+ sys-apps/help2man
+ test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+ "${FILESDIR}"/automake-1.16.2-py3-compile.patch
+)
+# All patches have been submitted upstream.
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ export WANT_AUTOCONF=2.5
+ # Don't try wrapping the autotools this thing runs as it tends
+ # to be a bit esoteric, and the script does `set -e` itself.
+ ./bootstrap || die
+ sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+
+ # Bug 628912
+ if ! has_version sys-apps/texinfo ; then
+ touch doc/{stamp-vti,version.texi,automake.info} || die
+ fi
+}
+
+# slot the info pages. do this w/out munging the source so we don't have
+# to depend on texinfo to regen things. #464146 (among others)
+slot_info_pages() {
+ pushd "${ED}"/usr/share/info >/dev/null || die
+ rm -f dir
+
+ # Rewrite all the references to other pages.
+ # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4.
+ # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4.
+ local p pages=( *.info ) args=()
+ for p in "${pages[@]/%.info}" ; do
+ args+=(
+ -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+ -e "s:(${p}):(${p}-${SLOT}):g"
+ )
+ done
+ sed -i "${args[@]}" * || die
+
+ # Rewrite all the file references, and rename them in the process.
+ local f d
+ for f in * ; do
+ d=${f/.info/-${SLOT}.info}
+ mv "${f}" "${d}" || die
+ sed -i -e "s:${f}:${d}:g" * || die
+ done
+
+ popd >/dev/null || die
+}
+
+src_install() {
+ default
+
+ slot_info_pages
+ rm "${ED}"/usr/share/aclocal/README || die
+ rmdir "${ED}"/usr/share/aclocal || die
+ rm \
+ "${ED}"/usr/bin/{aclocal,automake} \
+ "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
+
+ # remove all config.guess and config.sub files replacing them
+ # w/a symlink to a specific gnuconfig version
+ local x
+ for x in guess sub ; do
+ dosym ../gnuconfig/config.${x} \
+ /usr/share/${PN}-${SLOT}/config.${x}
+ done
+
+ # Avoid QA message about pre-compressed file in docs
+ local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+ if [[ -f "${tarfile}" ]] ; then
+ gunzip "${tarfile}" || die
+ fi
+}
diff --git a/sys-devel/automake/files/automake-1.16.2-py3-compile.patch b/sys-devel/automake/files/automake-1.16.2-py3-compile.patch
new file mode 100644
index 00000000000..7924f204ad4
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.2-py3-compile.patch
@@ -0,0 +1,73 @@
+From aa449bd4c836abf0320033c5077259fc760b622d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 3 Nov 2019 11:51:19 +0100
+Subject: [PATCH] py-compile: Support -OO for py3.5+, and -O&-OO for pypy3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ lib/py-compile | 29 +++++++++++++++++++++++++----
+ 1 file changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/lib/py-compile b/lib/py-compile
+index e56d98d6e..5b9ae5d5d 100755
+--- a/lib/py-compile
++++ b/lib/py-compile
+@@ -126,12 +126,10 @@ if test "$python_major" -le 2; then
+ import_lib=imp
+ import_test="hasattr(imp, 'get_tag')"
+ import_call=imp.cache_from_source
+- import_arg2=', False' # needed in one call and not the other
+ else
+ import_lib=importlib
+ import_test="hasattr(sys.implementation, 'cache_tag')"
+ import_call=importlib.util.cache_from_source
+- import_arg2=
+ fi
+
+ $PYTHON -c "
+@@ -159,7 +157,7 @@ $PYTHON -O -c "
+ import sys, os, py_compile, $import_lib
+
+ # pypy does not use .pyo optimization
+-if hasattr(sys, 'pypy_translation_info'):
++if hasattr(sys, 'pypy_translation_info') and sys.hexversion < 0x03050000:
+ sys.exit(0)
+
+ files = '''$files'''
+@@ -173,7 +171,30 @@ for file in files.split():
+ sys.stdout.write(file)
+ sys.stdout.flush()
+ if $import_test:
+- py_compile.compile(filepath, $import_call(filepath$import_arg2), path)
++ py_compile.compile(filepath, $import_call(filepath), path)
++ else:
++ py_compile.compile(filepath, filepath + 'o', path)
++sys.stdout.write('\n')" 2>/dev/null || :
++
++$PYTHON -OO -c "
++import sys, os, py_compile, $import_lib
++
++# python<3.5 does not have split files for -O and -OO
++if sys.hexversion < 0x03050000:
++ sys.exit(0)
++
++files = '''$files'''
++sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n')
++for file in files.split():
++ $pathtrans
++ $filetrans
++ if not os.path.exists(filepath) or not (len(filepath) >= 3
++ and filepath[-3:] == '.py'):
++ continue
++ sys.stdout.write(file)
++ sys.stdout.flush()
++ if $import_test:
++ py_compile.compile(filepath, $import_call(filepath), path)
+ else:
+ py_compile.compile(filepath, filepath + 'o', path)
+ sys.stdout.write('\n')" 2>/dev/null || :
+--
+2.25.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/
@ 2023-10-17 9:16 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2023-10-17 9:16 UTC (permalink / raw
To: gentoo-commits
commit: f3dd1d8b5b37ba3b4d8ecdd07466abf89caf19f1
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 09:16:06 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 09:16:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3dd1d8b
sys-devel/automake: fix test failure
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-devel/automake/automake-1.16.5-r1.ebuild | 2 +
.../automake-1.16.5-apostrophe-in-tests.patch | 51 ++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild b/sys-devel/automake/automake-1.16.5-r1.ebuild
index 934356a4ba66..de56751a7d57 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -56,6 +56,8 @@ PATCHES=(
"${FILESDIR}"/automake-1.16.2-py3-compile.patch
"${FILESDIR}"/automake-1.16.2-fix-instmany-python.sh-test.patch
"${FILESDIR}"/automake-1.16.2-fix-py-compile-basedir.sh-test.patch
+ # upstreamed
+ "${FILESDIR}"/automake-1.16.5-apostrophe-in-tests.patch
)
pkg_setup() {
diff --git a/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch b/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
new file mode 100644
index 000000000000..866284dfd185
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
@@ -0,0 +1,51 @@
+From ed1368e8803e8934a8bbab52a38753484dba2a37 Mon Sep 17 00:00:00 2001
+From: Karl Berry <karl@freefriends.org>
+Date: Mon, 12 Dec 2022 14:50:33 -0800
+Subject: test: avoid apostrophe in test document.
+
+From automake patch https://bugs.gnu.org/59989
+(though a different solution), suggestion by Frederic Berat.
+
+* t/txinfo-include.sh: avoid apostrophes in test document,
+since Texinfo 7.0 turns them into UTF-8 by default.
+---
+ t/txinfo-include.sh | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/t/txinfo-include.sh b/t/txinfo-include.sh
+index 8a15f01..10fff07 100644
+--- a/t/txinfo-include.sh
++++ b/t/txinfo-include.sh
+@@ -28,6 +28,9 @@ main_TEXINFOS = one.texi two.texi three.texi
+ sub_more_TEXINFOS = sub/desc.texi sub/hist.texi
+ END
+
++# We avoid apostrophes in the test document since Texinfo
++# turns them into UTF-8, which is not easy to grep.
++#
+ cat > main.texi << 'END'
+ \input texinfo
+ @setfilename main.info
+@@ -61,8 +64,8 @@ END
+
+ cat > three.texi << 'END'
+ @node three
+-@chapter Chapter two
+-GNU's Not Unix.
++@chapter Chapter three
++Quux quux quux.
+ END
+
+ mkdir sub
+@@ -106,7 +109,7 @@ check_info_contents ()
+ srcdir=${1-.}
+ $FGREP "Foo bar, baz." $srcdir/main.info
+ $FGREP "Blah Blah Blah." $srcdir/main.info
+- $FGREP "GNU's Not Unix." $srcdir/main.info
++ $FGREP "Quux quux quux." $srcdir/main.info
+ $FGREP 'It does something, really.' $srcdir/sub/more.info
+ $FGREP 'It was written somehow.' $srcdir/sub/more.info
+ }
+--
+cgit v1.1
+
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/
@ 2023-10-17 13:01 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2023-10-17 13:01 UTC (permalink / raw
To: gentoo-commits
commit: 1cf0eee856a8a6425af5b38a9f55cd9b24d7cefb
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 13:01:11 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 13:01:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf0eee8
sys-devel/automake: rebase patches
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-devel/automake/automake-1.11.6-r4.ebuild | 6 +++---
sys-devel/automake/automake-1.16.5-r1.ebuild | 8 ++++----
...> automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch} | 0
...omake-1.10-perl-5.16.patch => automake-1.11.6-perl-5.16.patch} | 0
...1.patch => automake-1.11.6-perl-escape-curly-bracket-r1.patch} | 0
...st.patch => automake-1.16.5-fix-instmany-python.sh-test.patch} | 0
...patch => automake-1.16.5-fix-py-compile-basedir.sh-test.patch} | 0
...1.16.2-py3-compile.patch => automake-1.16.5-py3-compile.patch} | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-devel/automake/automake-1.11.6-r4.ebuild b/sys-devel/automake/automake-1.11.6-r4.ebuild
index e8c72f202f6c..e8d4e6b93eda 100644
--- a/sys-devel/automake/automake-1.11.6-r4.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r4.ebuild
@@ -30,9 +30,9 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
- "${FILESDIR}"/${PN}-1.11-install-sh-avoid-low-risk-race-in-tmp.patch
- "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
+ "${FILESDIR}"/${P}-perl-5.16.patch #424453
+ "${FILESDIR}"/${P}-install-sh-avoid-low-risk-race-in-tmp.patch
+ "${FILESDIR}"/${P}-perl-escape-curly-bracket-r1.patch
)
src_prepare() {
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild b/sys-devel/automake/automake-1.16.5-r1.ebuild
index 131a6418d150..029332afd7db 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -53,11 +53,11 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/automake-1.16.2-py3-compile.patch
- "${FILESDIR}"/automake-1.16.2-fix-instmany-python.sh-test.patch
- "${FILESDIR}"/automake-1.16.2-fix-py-compile-basedir.sh-test.patch
+ "${FILESDIR}"/${PN}-1.16.5-py3-compile.patch
+ "${FILESDIR}"/${PN}-1.16.5-fix-instmany-python.sh-test.patch
+ "${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch
# upstreamed
- "${FILESDIR}"/automake-1.16.5-apostrophe-in-tests.patch
+ "${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch
)
pkg_setup() {
diff --git a/sys-devel/automake/files/automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch b/sys-devel/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
similarity index 100%
rename from sys-devel/automake/files/automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch
rename to sys-devel/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
diff --git a/sys-devel/automake/files/automake-1.10-perl-5.16.patch b/sys-devel/automake/files/automake-1.11.6-perl-5.16.patch
similarity index 100%
rename from sys-devel/automake/files/automake-1.10-perl-5.16.patch
rename to sys-devel/automake/files/automake-1.11.6-perl-5.16.patch
diff --git a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket-r1.patch b/sys-devel/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch
similarity index 100%
rename from sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket-r1.patch
rename to sys-devel/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch
diff --git a/sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch b/sys-devel/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch
similarity index 100%
rename from sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch
rename to sys-devel/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch
diff --git a/sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch b/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
similarity index 100%
rename from sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch
rename to sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
diff --git a/sys-devel/automake/files/automake-1.16.2-py3-compile.patch b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
similarity index 98%
rename from sys-devel/automake/files/automake-1.16.2-py3-compile.patch
rename to sys-devel/automake/files/automake-1.16.5-py3-compile.patch
index 7924f204ad4f..5333520b5db1 100644
--- a/sys-devel/automake/files/automake-1.16.2-py3-compile.patch
+++ b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
@@ -68,6 +68,6 @@ index e56d98d6e..5b9ae5d5d 100755
+ py_compile.compile(filepath, $import_call(filepath), path)
else:
py_compile.compile(filepath, filepath + 'o', path)
- sys.stdout.write('\n')" 2>/dev/null || :
+ sys.stdout.write('\n')" 2>/dev/null || exit $?
--
2.25.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/
@ 2023-12-07 18:06 Mike Frysinger
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger @ 2023-12-07 18:06 UTC (permalink / raw
To: gentoo-commits
commit: c0d6cc0dc513dfbf88aebca45faaa488c1d07107
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 7 18:01:46 2023 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 18:01:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d6cc0d
sys-devel/automake: add upstream status info
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
Signed-off-by: Mike Frysinger <vapier <AT> chromium.org>
sys-devel/automake/automake-1.16.5-r1.ebuild | 1 -
sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch | 2 ++
.../automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch | 2 ++
sys-devel/automake/files/automake-1.16.5-py3-compile.patch | 2 ++
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild b/sys-devel/automake/automake-1.16.5-r1.ebuild
index 029332afd7db..63a8ed1a1c80 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -56,7 +56,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.16.5-py3-compile.patch
"${FILESDIR}"/${PN}-1.16.5-fix-instmany-python.sh-test.patch
"${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch
- # upstreamed
"${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch
)
diff --git a/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch b/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
index 866284dfd185..2c1c99d57367 100644
--- a/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
+++ b/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
@@ -1,3 +1,5 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=ed1368e8803e8934a8bbab52a38753484dba2a37
+
From ed1368e8803e8934a8bbab52a38753484dba2a37 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 12 Dec 2022 14:50:33 -0800
diff --git a/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch b/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
index f49dd253c2d6..85273d6aaf03 100644
--- a/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
+++ b/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
@@ -1,3 +1,5 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=ae8fb00111ba0c4922609cd9beb552fb41b66cc6
+
From e3db5b8038a902501a354b6921dcebcb4180f50a Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Fri, 20 Nov 2020 02:13:56 +0100
diff --git a/sys-devel/automake/files/automake-1.16.5-py3-compile.patch b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
index 5333520b5db1..003b391b04ac 100644
--- a/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
+++ b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
@@ -1,3 +1,5 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=bde43d0481ff540418271ac37012a574a4fcf097
+
From aa449bd4c836abf0320033c5077259fc760b622d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sun, 3 Nov 2019 11:51:19 +0100
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/
@ 2023-12-07 18:06 Mike Frysinger
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger @ 2023-12-07 18:06 UTC (permalink / raw
To: gentoo-commits
commit: f001546b5b91fa9b192aa02cff75fcdbc3d9f34c
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 7 18:05:04 2023 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 18:05:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f001546b
sys-devel/automake: fix parallel builds
Fix from upstream for building automake in parallel.
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
Signed-off-by: Mike Frysinger <vapier <AT> chromium.org>
sys-devel/automake/automake-1.16.5-r1.ebuild | 1 +
.../files/automake-1.16.5-parallel-build.patch | 54 ++++++++++++++++++++++
2 files changed, 55 insertions(+)
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild b/sys-devel/automake/automake-1.16.5-r1.ebuild
index 63a8ed1a1c80..0e6ed8d0b1dc 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.16.5-fix-instmany-python.sh-test.patch
"${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch
"${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch
+ "${FILESDIR}"/${PN}-1.16.5-parallel-build.patch
)
pkg_setup() {
diff --git a/sys-devel/automake/files/automake-1.16.5-parallel-build.patch b/sys-devel/automake/files/automake-1.16.5-parallel-build.patch
new file mode 100644
index 000000000000..985e86aeb32c
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.5-parallel-build.patch
@@ -0,0 +1,54 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=5d02285845acfc20a4900a471c0e7c5e2ff390a0
+
+From 5d02285845acfc20a4900a471c0e7c5e2ff390a0 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 18 Jan 2022 04:47:09 -0500
+Subject: [PATCH] build: fix race in parallel builds
+
+As reported by Hongxu Jia:
+> The automake-$(APIVERSION) is a hardlink of automake, if it is
+> created later than update_mans executing, there is a failure
+> [snip]
+> |: && mkdir -p doc && ./pre-inst-env /usr/bin/env perl ../automake-1.16.1/doc/help2man --output=doc/aclocal-1.16.1 aclocal-1.16
+> |help2man: can't get `--help' info from aclocal-1.16
+> |Try `--no-discard-stderr' if option outputs to stderr
+> Makefile:3693: recipe for target 'doc/aclocal-1.16.1' failed
+> [snip]
+>
+> The automake_script is required by update_mans and update_mans
+> invokes automake-$(APIVERSION) rather than automake to generate
+> doc, so we should assign `automake-$(APIVERSION)' to automake_script.
+>
+> The same reason to tweak aclocal_script.
+
+However, rather than update the _script variables to point to the
+hardlinked copies of the programs, we can have the help2man steps
+run the existing scripts directly. This makes the relationship a
+bit more explicit and avoids implicit dependencies on names.
+
+* doc/local.mk: Pass $(aclocal_script) and $(automake_script) to $(update_mans).
+* THANKS: Add Hongxu Jia.
+---
+ THANKS | 1 +
+ doc/local.mk | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/doc/local.mk b/doc/local.mk
+index a29363d2d71b..06c78823a574 100644
+--- a/doc/local.mk
++++ b/doc/local.mk
+@@ -46,9 +46,9 @@ update_mans = \
+ && echo ".so man1/$$f-$(APIVERSION).1" > $@
+
+ %D%/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
+- $(update_mans) aclocal-$(APIVERSION)
++ $(update_mans) $(aclocal_script)
+ %D%/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
+- $(update_mans) automake-$(APIVERSION)
++ $(update_mans) $(automake_script)
+
+ ## This target is not invoked as a dependency of anything. It exists
+ ## merely to make checking the links in automake.texi (that is,
+--
+2.43.0
+
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-12-07 18:07 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-20 5:04 [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2023-12-07 18:06 Mike Frysinger
2023-12-07 18:06 Mike Frysinger
2023-10-17 13:01 David Seifert
2023-10-17 9:16 David Seifert
2020-03-22 13:03 Lars Wendler
2019-11-08 9:47 Lars Wendler
2018-02-26 22:40 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox