From d36d3f0b78252a399c2b455f4cda17dc46e2ec06 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 27 Dec 2024 23:41:43 +0100 Subject: [PATCH] Rename module sys_utsname to sys_utsname-h. * modules/sys_utsname-h: Renamed from modules/sys_utsname. * modules/sys_utsname-h-tests: Renamed from modules/sys_utsname-tests. * modules/sys_utsname-h-c++-tests: Renamed from modules/sys_utsname-c++-tests. * tests/test-sys_utsname-h.c: Renamed from tests/test-sys_utsname.c. * tests/test-sys_utsname-h-c++.cc: Renamed from tests/test-sys_utsname-c++.cc. * doc/posix-headers/sys_utsname.texi: Update. * modules/* (Depends-on): Update. * modules/sys_utsname: New file. --- ChangeLog | 14 ++++++ doc/posix-headers/sys_utsname.texi | 4 +- modules/posixcheck | 2 +- modules/sys_utsname | 39 +++------------ modules/sys_utsname-c++-tests | 17 ------- modules/sys_utsname-h | 50 +++++++++++++++++++ modules/sys_utsname-h-c++-tests | 17 +++++++ modules/sys_utsname-h-tests | 11 ++++ modules/sys_utsname-tests | 11 ---- modules/uname | 2 +- ...sname-c++.cc => test-sys_utsname-h-c++.cc} | 0 ...est-sys_utsname.c => test-sys_utsname-h.c} | 0 12 files changed, 103 insertions(+), 64 deletions(-) delete mode 100644 modules/sys_utsname-c++-tests create mode 100644 modules/sys_utsname-h create mode 100644 modules/sys_utsname-h-c++-tests create mode 100644 modules/sys_utsname-h-tests delete mode 100644 modules/sys_utsname-tests rename tests/{test-sys_utsname-c++.cc => test-sys_utsname-h-c++.cc} (100%) rename tests/{test-sys_utsname.c => test-sys_utsname-h.c} (100%) diff --git a/ChangeLog b/ChangeLog index e67e0c52b3..6a269c0431 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2024-12-27 Bruno Haible + + Rename module sys_utsname to sys_utsname-h. + * modules/sys_utsname-h: Renamed from modules/sys_utsname. + * modules/sys_utsname-h-tests: Renamed from modules/sys_utsname-tests. + * modules/sys_utsname-h-c++-tests: Renamed from + modules/sys_utsname-c++-tests. + * tests/test-sys_utsname-h.c: Renamed from tests/test-sys_utsname.c. + * tests/test-sys_utsname-h-c++.cc: Renamed from + tests/test-sys_utsname-c++.cc. + * doc/posix-headers/sys_utsname.texi: Update. + * modules/* (Depends-on): Update. + * modules/sys_utsname: New file. + 2024-12-27 Bruno Haible Rename module sys_un to sys_un-h. diff --git a/doc/posix-headers/sys_utsname.texi b/doc/posix-headers/sys_utsname.texi index 4fd28b3b72..11bed6b453 100644 --- a/doc/posix-headers/sys_utsname.texi +++ b/doc/posix-headers/sys_utsname.texi @@ -3,8 +3,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_utsname.h.html} -Gnulib module: sys_utsname -@mindex sys_utsname +Gnulib module: sys_utsname-h +@mindex sys_utsname-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/posixcheck b/modules/posixcheck index 343bdf4133..c2d0b5219b 100644 --- a/modules/posixcheck +++ b/modules/posixcheck @@ -41,7 +41,7 @@ sys_socket-h sys_stat-h sys_time-h sys_times-h -sys_utsname +sys_utsname-h sys_wait termios threads-h diff --git a/modules/sys_utsname b/modules/sys_utsname index f8aa62f5c2..7814be8292 100644 --- a/modules/sys_utsname +++ b/modules/sys_utsname @@ -1,44 +1,20 @@ Description: A for systems which lack it. +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'sys_utsname-h' instead. + Files: -lib/sys_utsname.in.h -m4/sys_utsname_h.m4 Depends-on: -gen-header -include_next -snippet/arg-nonnull -snippet/warn-on-use +sys_utsname-h configure.ac: -gl_SYS_UTSNAME_H -gl_SYS_UTSNAME_H_REQUIRE_DEFAULTS -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += sys/utsname.h - -# We need the following in order to create when the system -# does not have one. -sys/utsname.h: sys_utsname.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ - -e 's/@''HAVE_SYS_UTSNAME_H''@/$(HAVE_SYS_UTSNAME_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_UTSNAME_H''@|$(NEXT_SYS_UTSNAME_H)|g' \ - -e 's/@''GNULIB_UNAME''@/$(GNULIB_UNAME)/g' \ - -e 's|@''HAVE_STRUCT_UTSNAME''@|$(HAVE_STRUCT_UTSNAME)|g' \ - -e 's|@''HAVE_UNAME''@|$(HAVE_UNAME)|g' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - $(srcdir)/sys_utsname.in.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += sys/utsname.h sys/utsname.h-t -MOSTLYCLEANDIRS += sys Include: @@ -47,4 +23,3 @@ License: LGPLv2+ Maintainer: -all diff --git a/modules/sys_utsname-c++-tests b/modules/sys_utsname-c++-tests deleted file mode 100644 index 2f2a1b39dd..0000000000 --- a/modules/sys_utsname-c++-tests +++ /dev/null @@ -1,17 +0,0 @@ -Files: -tests/test-sys_utsname-c++.cc - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-sys_utsname-c++ -check_PROGRAMS += test-sys_utsname-c++ -test_sys_utsname_c___SOURCES = test-sys_utsname-c++.cc -endif diff --git a/modules/sys_utsname-h b/modules/sys_utsname-h new file mode 100644 index 0000000000..f8aa62f5c2 --- /dev/null +++ b/modules/sys_utsname-h @@ -0,0 +1,50 @@ +Description: +A for systems which lack it. + +Files: +lib/sys_utsname.in.h +m4/sys_utsname_h.m4 + +Depends-on: +gen-header +include_next +snippet/arg-nonnull +snippet/warn-on-use + +configure.ac: +gl_SYS_UTSNAME_H +gl_SYS_UTSNAME_H_REQUIRE_DEFAULTS +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += sys/utsname.h + +# We need the following in order to create when the system +# does not have one. +sys/utsname.h: sys_utsname.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H) + $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys' + $(AM_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ + -e 's/@''HAVE_SYS_UTSNAME_H''@/$(HAVE_SYS_UTSNAME_H)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_UTSNAME_H''@|$(NEXT_SYS_UTSNAME_H)|g' \ + -e 's/@''GNULIB_UNAME''@/$(GNULIB_UNAME)/g' \ + -e 's|@''HAVE_STRUCT_UTSNAME''@|$(HAVE_STRUCT_UTSNAME)|g' \ + -e 's|@''HAVE_UNAME''@|$(HAVE_UNAME)|g' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/sys_utsname.in.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += sys/utsname.h sys/utsname.h-t +MOSTLYCLEANDIRS += sys + +Include: + + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/sys_utsname-h-c++-tests b/modules/sys_utsname-h-c++-tests new file mode 100644 index 0000000000..c8d84ce215 --- /dev/null +++ b/modules/sys_utsname-h-c++-tests @@ -0,0 +1,17 @@ +Files: +tests/test-sys_utsname-h-c++.cc + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-sys_utsname-h-c++ +check_PROGRAMS += test-sys_utsname-h-c++ +test_sys_utsname_h_c___SOURCES = test-sys_utsname-h-c++.cc +endif diff --git a/modules/sys_utsname-h-tests b/modules/sys_utsname-h-tests new file mode 100644 index 0000000000..904df4d79e --- /dev/null +++ b/modules/sys_utsname-h-tests @@ -0,0 +1,11 @@ +Files: +tests/test-sys_utsname-h.c + +Depends-on: +sys_utsname-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-sys_utsname-h +check_PROGRAMS += test-sys_utsname-h diff --git a/modules/sys_utsname-tests b/modules/sys_utsname-tests deleted file mode 100644 index 9b958c7a74..0000000000 --- a/modules/sys_utsname-tests +++ /dev/null @@ -1,11 +0,0 @@ -Files: -tests/test-sys_utsname.c - -Depends-on: -sys_utsname-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-sys_utsname -check_PROGRAMS += test-sys_utsname diff --git a/modules/uname b/modules/uname index 199bf34f24..4afe411061 100644 --- a/modules/uname +++ b/modules/uname @@ -6,7 +6,7 @@ lib/uname.c m4/uname.m4 Depends-on: -sys_utsname +sys_utsname-h gethostname [test $HAVE_UNAME = 0] configure.ac: diff --git a/tests/test-sys_utsname-c++.cc b/tests/test-sys_utsname-h-c++.cc similarity index 100% rename from tests/test-sys_utsname-c++.cc rename to tests/test-sys_utsname-h-c++.cc diff --git a/tests/test-sys_utsname.c b/tests/test-sys_utsname-h.c similarity index 100% rename from tests/test-sys_utsname.c rename to tests/test-sys_utsname-h.c -- 2.39.5