From: Collin Funk Date: Thu, 29 Feb 2024 05:17:49 +0000 (-0800) Subject: gnulib-tool.py: Follow gnulib-tool changes, part 34. X-Git-Tag: v1.0~357 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c95b4a62ee6c082cd9caa0127b013f8b4e7c9203;p=gnulib.git gnulib-tool.py: Follow gnulib-tool changes, part 34. Follow gnulib-tool change 2017-05-15 Bruno Haible gnulib-tool: Fix generated code when libtests contains module 'alloca'. * pygnulib/GLEmiter.py (GLEmiter.tests_Makefile_am): Use @ALLOCA@ for libtests.a instead of @LTALLOCA@. --- diff --git a/ChangeLog b/ChangeLog index e54a687bdb..c16681c772 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2024-02-29 Collin Funk + + gnulib-tool.py: Follow gnulib-tool changes, part 34. + Follow gnulib-tool change + 2017-05-15 Bruno Haible + gnulib-tool: Fix generated code when libtests contains module 'alloca'. + * pygnulib/GLEmiter.py (GLEmiter.tests_Makefile_am): Use @ALLOCA@ for + libtests.a instead of @LTALLOCA@. + 2024-02-29 Collin Funk gnulib-tool.py: Follow gnulib-tool changes, part 33. diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO index 42cccaf71e..cd1274a7be 100644 --- a/gnulib-tool.py.TODO +++ b/gnulib-tool.py.TODO @@ -819,17 +819,6 @@ Date: Sat May 20 13:24:37 2017 +0200 -------------------------------------------------------------------------------- -commit 0414a24cf57f1569b0b4f2a0f22898a0943dfc14 -Author: Bruno Haible -Date: Mon May 15 23:13:57 2017 +0200 - - gnulib-tool: Fix generated code when libtests contains module 'alloca'. - - * gnulib-tool (func_emit_tests_Makefile_am): For libtests.a, use - @ALLOCA@, not @LTALLOCA@. - --------------------------------------------------------------------------------- - commit f30205c5d59bab2c035165158e7d5d65b07b8363 Author: Mathieu Lirzin Date: Tue Mar 14 12:19:40 2017 +0100 diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 260478e5da..dcabc3523c 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -993,8 +993,8 @@ AC_DEFUN([%V1%_LIBSOURCES], [ include_guard_prefix) # Check if module is 'alloca'. if libtests and str(module) == 'alloca': - snippet += 'libtests_a_LIBADD += @%sALLOCA@\n' % perhapsLT - snippet += 'libtests_a_DEPENDENCIES += @%sALLOCA@\n' % perhapsLT + snippet += 'libtests_a_LIBADD += @ALLOCA@\n' + snippet += 'libtests_a_DEPENDENCIES += @ALLOCA@\n' # Skip the contents if it's entirely empty. if not snippet.isspace():