Update to newest gnulib.

This required a dependency on Automake 1.11 or later.  It also required
dropping C2x compatibility warnings because Gnulib now triggers them.  The
Gnulib tempname module requires linking against $(LIB_GETRANDOM), so this
adds that in each case where the build links against libgl.

diff --git a/Makefile.am b/Makefile.am
index b571440544eea389860dda85ffab45d3b32ce8a4..a0b145747b4f9f2fbc15751605b99d4c2b9fd2b6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@
 
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects
+AUTOMAKE_OPTIONS = std-options check-news 1.11 subdir-objects
 
 SUBDIRS = gl po
 DISTCLEANFILES = ./po/stamp-po xconfigure

diff --git a/README.Git b/README.Git
index 8202f03b591c4b34ce89f5b62d47e8b4d6a7df5b..576deff61bd58f04f2428a93ecfaa55554524a9e 100644 (file)
--- a/README.Git
+++ b/README.Git
@@ -36,14 +36,11 @@ This version of PSPP should work with the Gnulib commit shown below.
 Gnulib does not maintain a stable API or ABI, so it is possible that
 PSPP will not work with older or newer versions of Gnulib.
 
- commit 0edaafc813caff4101c58405c6ab279597afc0b9
+ commit 2d830e4a792fcd9f614ed08a7f18584b8b21d23b (HEAD, origin/master, origin/HEAD)
  Author: Bruno Haible <bruno@clisp.org>
- Date:   Sat Oct 10 22:52:22 2020 +0200
+ Date:   Sun Mar 13 15:12:46 2022 +0100
 
-     *-list, *-oset, *-omap: Avoid possible compiler warnings.
-
-     Reported by Marc Nieper-Wißkirchen in
-     <https://lists.gnu.org/r/bug-gnulib/2020-10/msg00025.html>.
+     sigsegv: Add support for Linux/PowerPC (32-bit) with musl libc.
 
 To clone Gnulib into a directory named "gnulib" using Git, and then
 check out this particular commit, run these commands:

diff --git a/configure.ac b/configure.ac
index 109330f10f2025d367dfea48610c421e0cac80aa..67a37f9fabd8747f341d6af26657ab9741d5bf5d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,6 @@ PSPP_ENABLE_OPTION([-Wstrict-prototypes])
 PSPP_ENABLE_OPTION([-Wpointer-arith])
 PSPP_ENABLE_OPTION([-Wno-sign-compare])
 PSPP_ENABLE_OPTION([-Wmissing-prototypes])
-PSPP_ENABLE_OPTION([-Wc11-c2x-compat])
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 AM_CONDITIONAL(host_is_w32, [case $host_os in mingw*) true;; *) false;; esac] )

diff --git a/src/automake.mk b/src/automake.mk
index c8f775c1e8177d4f8ab5e7bb75595032487b5d5a..ddf2f287d7dd46d9687466264a0d9dc7addea8c0 100644 (file)
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -35,7 +35,7 @@ src_libpspp_core_la_LDFLAGS = -release $(VERSION)
 src_libpspp_core_la_LIBADD = \
        src/data/libdata.la \
        src/libpspp/liblibpspp.la \
-       $(LIBXML2_LIBS) $(PG_LIBS) \
+       $(LIBXML2_LIBS) $(PG_LIBS) $(LIB_GETRANDOM) \
        gl/libgl.la
 
 src_libpspp_la_SOURCES =

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index e0e9cab0c796da219a5d515ee7d627f893d2ac37..42500c049fbdd10a842ecfd6eb6dcd0823ae24ff 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -119,7 +119,8 @@ src_ui_gui_psppire_LDADD = \
        $(LIBRSVG_LIBS) \
        $(CAIRO_LIBS) \
        $(LIBINTL) \
-       $(GSL_LIBS)
+       $(GSL_LIBS) \
+       $(LIB_GETRANDOM)
 
 if host_is_w32
 src_ui_gui_psppire_LDADD += src/ui/gui/pspp.res
@@ -130,7 +131,8 @@ endif
 src_ui_gui_spreadsheet_test_LDADD = \
        src/libpspp-core.la \
        $(GTK_LIBS) \
-       $(GTHREAD_LIBS)
+       $(GTHREAD_LIBS) \
+       $(LIB_GETRANDOM)
 
 
 src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/psppire-spreadsheet-model.c

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 5169110d2e79c7129a701137cfc8908f318bcce0..936be197e5d1268ebe0de5aba58d337db4b9d03d 100644 (file)
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -39,7 +39,8 @@ src_ui_terminal_pspp_LDADD = \
        $(CAIRO_LIBS) \
        $(NCURSES_LIBS) \
        $(LTLIBREADLINE) \
-       $(GSL_LIBS)
+       $(GSL_LIBS) \
+       $(LIB_GETRANDOM)
 
 
 src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)

diff --git a/tests/automake.mk b/tests/automake.mk
index 7b5f9286be42608f4ebf66d11c56743123f3ff72..f9bea8fa51cca393a6141ccccd1e043d15d73bd3 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -62,7 +62,7 @@ check_PROGRAMS += tests/libpspp/heap-test
 tests_libpspp_heap_test_SOURCES = \
        tests/libpspp/heap-test.c
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_heap_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_heap_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/libpspp/hmap-test
 tests_libpspp_hmap_test_SOURCES = \
@@ -79,7 +79,7 @@ tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 check_PROGRAMS += tests/libpspp/i18n-test
 tests_libpspp_i18n_test_SOURCES = tests/libpspp/i18n-test.c
-tests_libpspp_i18n_test_LDADD = src/libpspp-core.la gl/libgl.la
+tests_libpspp_i18n_test_LDADD = src/libpspp-core.la gl/libgl.la $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/libpspp/abt-test
 tests_libpspp_abt_test_SOURCES = \
@@ -110,24 +110,24 @@ check_PROGRAMS += tests/libpspp/range-set-test
 tests_libpspp_range_set_test_SOURCES = \
        tests/libpspp/range-set-test.c
 tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_range_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_range_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/libpspp/range-tower-test
 tests_libpspp_range_tower_test_SOURCES = \
        tests/libpspp/range-tower-test.c
 tests_libpspp_range_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_range_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_range_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/libpspp/str-test
 tests_libpspp_str_test_SOURCES = \
        tests/libpspp/str-test.c
-tests_libpspp_str_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_str_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/libpspp/string-map-test
 tests_libpspp_string_map_test_SOURCES = \
        tests/libpspp/string-map-test.c
 tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_string_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_string_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/libpspp/stringi-map-test
 tests_libpspp_stringi_map_test_SOURCES = \
@@ -153,7 +153,7 @@ check_PROGRAMS += tests/libpspp/tower-test
 tests_libpspp_tower_test_SOURCES = \
        tests/libpspp/tower-test.c
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/libpspp/u8-istream-test
 tests_libpspp_u8_istream_test_SOURCES = tests/libpspp/u8-istream-test.c
@@ -163,7 +163,7 @@ check_PROGRAMS += tests/libpspp/sparse-array-test
 tests_libpspp_sparse_array_test_SOURCES = \
        tests/libpspp/sparse-array-test.c
 tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_sparse_array_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_sparse_array_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/libpspp/sparse-xarray-test
 tests_libpspp_sparse_xarray_test_SOURCES = \
@@ -171,7 +171,8 @@ tests_libpspp_sparse_xarray_test_SOURCES = \
 tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/liblibpspp.la \
        src/libpspp-core.la \
-       gl/libgl.la
+       gl/libgl.la \
+       $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/data/inexactify
 tests_data_inexactify_SOURCES = tests/data/inexactify.c
@@ -183,7 +184,8 @@ tests_language_lexer_command_name_test_SOURCES = \
        tests/language/lexer/command-name-test.c
 tests_language_lexer_command_name_test_LDADD = \
        src/libpspp/liblibpspp.la \
-       gl/libgl.la
+       gl/libgl.la \
+       $(LIB_GETRANDOM)
 tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS)
 
 check_PROGRAMS += tests/language/lexer/scan-test
@@ -197,7 +199,8 @@ tests_language_lexer_scan_test_SOURCES = \
 tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS)
 tests_language_lexer_scan_test_LDADD = \
        src/libpspp/liblibpspp.la \
-       gl/libgl.la
+       gl/libgl.la \
+       $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/language/lexer/segment-test
 tests_language_lexer_segment_test_SOURCES = \
@@ -208,7 +211,8 @@ tests_language_lexer_segment_test_SOURCES = \
 tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS)
 tests_language_lexer_segment_test_LDADD = \
        src/libpspp/liblibpspp.la \
-       gl/libgl.la
+       gl/libgl.la \
+       $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/libpspp/zip-test
 tests_libpspp_zip_test_SOURCES = \
@@ -218,7 +222,8 @@ tests_libpspp_zip_test_CFLAGS = $(AM_CFLAGS)
 tests_libpspp_zip_test_LDADD = \
        src/libpspp/liblibpspp.la \
        src/libpspp-core.la \
-       gl/libgl.la
+       gl/libgl.la \
+       $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/math/chart-get-scale-test
 tests_math_chart_get_scale_test_SOURCES = tests/math/chart-get-scale-test.c
@@ -226,7 +231,8 @@ tests_math_chart_get_scale_test_LDADD = \
        src/math/libpspp-math.la \
        src/libpspp/liblibpspp.la \
        src/libpspp-core.la \
-       gl/libgl.la
+       gl/libgl.la \
+       $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/math/chart-get-ticks-format-test
 tests_math_chart_get_ticks_format_test_SOURCES = tests/math/chart-get-ticks-format-test.c
@@ -234,7 +240,8 @@ tests_math_chart_get_ticks_format_test_LDADD = \
        src/math/libpspp-math.la \
        src/libpspp/liblibpspp.la \
        src/libpspp-core.la \
-       gl/libgl.la
+       gl/libgl.la \
+       $(LIB_GETRANDOM)
 
 check_PROGRAMS += tests/output/pivot-table-test
 tests_output_pivot_table_test_SOURCES = tests/output/pivot-table-test.c
@@ -242,6 +249,7 @@ tests_output_pivot_table_test_LDADD = \
        src/libpspp.la \
        src/libpspp-core.la \
        gl/libgl.la \
+       $(LIB_GETRANDOM) \
        $(CAIRO_LIBS)
 EXTRA_DIST += tests/output/look.stt