diff options
Diffstat (limited to 'main/automake')
| -rw-r--r-- | main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch | 70 | ||||
| -rw-r--r-- | main/automake/APKBUILD | 12 |
2 files changed, 6 insertions, 76 deletions
diff --git a/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch b/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch deleted file mode 100644 index 9923474f4c7..00000000000 --- a/main/automake/0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 3009ad094f5807c512e79224a8acee5a81a736b0 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt <jengelh@inai.de> -Date: Sun, 29 Aug 2021 13:02:33 +0200 -Subject: [PATCH] automake: add install dep on install-libLTLIBRARIES to all - targets - -A Makefile.am like - - bin_PROGRAMS = - lib_LTLIBRARIES = library1.la - pkglib_LTLIBRARIES = library2.la - library2_LIBADD = library1.la - -produces, in Makefile.in, - - install-binPROGRAMS: install-libLTLIBRARIES - -but no - - install-pkglibLTLIBRARIES: install-libLTLIBRARIES - -therefore potentially breaking `make install -j`. Rectify this by -depending on install-libLTLIBRARIES not just for bin_PROGRAMS, but -all PROGRAMS and LTLIBRARIES. - -Signed-off-by: Jan Engelhardt <jengelh@inai.de> ---- - bin/automake.in | 25 +++++++++++++++++++------ - 1 file changed, 19 insertions(+), 6 deletions(-) - -diff --git a/bin/automake.in b/bin/automake.in -index f04f5d5f5..30babd607 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -8042,13 +8042,26 @@ sub generate_makefile - handle_all ($makefile); - - # FIXME: Gross! -- if (var ('lib_LTLIBRARIES') && var ('bin_PROGRAMS')) -+ my $have_lt1 = !!var("lib_LTLIBRARIES"); -+ my $have_lt2 = !!var("nobase_lib_LTLIBRARIES"); -+ for my $var (variables("PROGRAMS"), variables("LTLIBRARIES")) - { -- $output_rules .= "install-binPROGRAMS: install-libLTLIBRARIES\n\n"; -- } -- if (var ('nobase_lib_LTLIBRARIES') && var ('bin_PROGRAMS')) -- { -- $output_rules .= "install-binPROGRAMS: install-nobase_libLTLIBRARIES\n\n"; -+ if ($var->name eq "lib_LTLIBRARIES" -+ || $var->name eq "nobase_lib_LTLIBRARIES" -+ || substr($var->name, 0, 7) eq "noinst_") -+ { -+ next; -+ } -+ my $shortname = $var->name; -+ $shortname =~ tr{_}{}d; -+ if ($have_lt1) -+ { -+ $output_rules .= "install-$shortname: install-libLTLIBRARIES\n\n"; -+ } -+ if ($have_lt2) -+ { -+ $output_rules .= "install-$shortname: install-nobase_libLTLIBRARIES\n\n"; -+ } - } - - handle_install; --- -2.33.0 - diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD index b046b621f7e..e12a3bccd4a 100644 --- a/main/automake/APKBUILD +++ b/main/automake/APKBUILD @@ -1,16 +1,16 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=automake -pkgver=1.16.4 -pkgrel=1 +pkgver=1.16.5 +pkgrel=2 pkgdesc="GNU tool for automatically creating Makefiles" url="https://www.gnu.org/software/automake" arch="noarch" -license="GPL-2.0-or-later MIT Public-Domain" +license="GPL-2.0-or-later" depends="perl" makedepends="autoconf" subpackages="$pkgname-doc" source="https://ftp.gnu.org/gnu/automake/automake-$pkgver.tar.xz - 0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch + $pkgname-python3.10.patch::https://github.com/autotools-mirror/automake/commit/930a9a73f4bb776ec334eff4cf6e182802841daa.patch " # many tests have bashisms @@ -33,6 +33,6 @@ package() { } sha512sums=" -5a8883657e73b75bfa1ee59ab04af6bf4d43f390ab62fb7a9e8e2ac66159dfe4947b2ac7bc1028afffe6a09d88f388339500e03f6cdfa1226985be45ec033246 automake-1.16.4.tar.xz -ff5fc38987afd00076f32f42bb58f5cffca8de246f8354321f2c8564e1465b9f5d373b4fe6a54f18962c8850717a2d955bdab50ea59068f1ab285da18035b7fd 0001-automake-add-install-dep-on-install-libLTLIBRARIES-t.patch +3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 automake-1.16.5.tar.xz +cd22baa12751be72b35a926127c85d793d1ccf69c48d4d0911b2cbd2b9f1249d6eecae4f90be60847a7880861abf59cc10b8846367885e1c6aadc4dd2d0219a0 automake-python3.10.patch " |