From 07cf4b8fcf35643a0d566f8e8d10f123bb2e09d4 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Fri, 1 Dec 2023 01:12:24 -0500 Subject: [PATCH] Replace gnulib patches with new common helper macro. Using the new DX_PATCH_GNULIB macro allows m4 to implement the conditional dependency patches that were previously being done in bootstrap, as well as removing the gl_CC_GNULIB_WARNINGS stub. --- bootstrap | 8 +------- common | 2 +- configure.ac | 5 ++--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/bootstrap b/bootstrap index 19efbbd..2ab4a58 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright © 2011-2012, 2015, 2021-2022 Nick Bowler +# Copyright © 2011-2012, 2015, 2021-2023 Nick Bowler # # Simple script to get started from a fresh git checkout. # @@ -54,12 +54,6 @@ test ! -f libltdl/ltdl.mk || mv -f libltdl/ltdl.mk libltdl/ltdl.mk.in $PERL common/scripts/fix-ltdl.pl -o libltdl/ltdl.mk -i libltdl/ltdl.mk.in \ || die "Failed to fixup libltdl makefile fragment." -# Rewrite if ! ... construts produced by gnulib conditional dependencies -# as these fail in heirloom-sh. -sed 's/if ! *\(.*gnulib_enabled[^;]*\); then/if \1; then :; else/' \ - m4/gnulib-comp.m4 >m4/gnulib-comp.m4.new || exit -mv -f m4/gnulib-comp.m4.new m4/gnulib-comp.m4 || exit - # Punt some automake-generated files so that Gentoo's wrapper script doesn't # try to detect the automake version in use. rm -f Makefile.in aclocal.m4 diff --git a/common b/common index a7cabb5..262d3ea 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a7cabb5d0f067e78afd029d8ec41d14660d8f9e2 +Subproject commit 262d3eaea39294df3f6172b28213e927e2f3b424 diff --git a/configure.ac b/configure.ac index fef7121..ebd7d4d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,10 @@ -dnl Copyright © 2009-2012, 2015, 2019-2020, 2022 Nick Bowler +dnl Copyright © 2009-2012, 2015, 2019-2020, 2022-2023 Nick Bowler dnl dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2. dnl This is free software: you are free to do what the fuck you want to. dnl There is NO WARRANTY, to the extent permitted by law. -dnl remove pointless gnulib warning flag check -AC_DEFUN([gl_CC_GNULIB_WARNINGS]) +DX_PATCH_GNULIB AC_INIT([upkg],[0.1],[nbowler@draconx.ca]) AC_CONFIG_SRCDIR([src/libupkg.c]) -- 2.43.2