Rename module sys_random to sys_random-h.

* modules/sys_random-h: Renamed from modules/sys_random. * modules/sys_random-h-tests: Renamed from modules/sys_random-tests. * modules/sys_random-h-c++-tests: Renamed from modules/sys_random-c++-tests. * tests/test-sys_random-h.c: Renamed from tests/test-sys_random.c. * tests/test-sys_random-h-c++.cc: Renamed from tests/test-sys_random-c++.cc. * doc/glibc-headers/sys_random.texi: Update. * modules/* (Depends-on): Update. * modules/sys_random: New file.
2025-08-08 17:22:05 +03:00 · 2024-12-27 23:39:52 +01:00
parent c33575fa40
commit 05eea16ace
12 changed files with 107 additions and 68 deletions
--- a/14
+++ b/14
@@ -1,3 +1,17 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+	Rename module sys_random to sys_random-h.
+	* modules/sys_random-h: Renamed from modules/sys_random.
+	* modules/sys_random-h-tests: Renamed from modules/sys_random-tests.
+	* modules/sys_random-h-c++-tests: Renamed from
+	modules/sys_random-c++-tests.
+	* tests/test-sys_random-h.c: Renamed from tests/test-sys_random.c.
+	* tests/test-sys_random-h-c++.cc: Renamed from
+	tests/test-sys_random-c++.cc.
+	* doc/glibc-headers/sys_random.texi: Update.
+	* modules/* (Depends-on): Update.
+	* modules/sys_random: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>

 	Rename module sys_msg to sys_msg-h.
--- a/doc/glibc-headers/sys_random.texi
+++ b/doc/glibc-headers/sys_random.texi
@@ -16,8 +16,8 @@ Documentation:
@uref{https://www.kernel.org/doc/man-pages/online/pages/man2/getrandom.2.html,,man getrandom}.
@end itemize

-Gnulib module: sys_random
-@mindex sys_random
+Gnulib module: sys_random-h
+@mindex sys_random-h

 Portability problems fixed by Gnulib:
@itemize
--- a/modules/getrandom
+++ b/modules/getrandom
@@ -6,7 +6,7 @@ lib/getrandom.c
 m4/getrandom.m4

 Depends-on:
-sys_random
+sys_random-h
 fcntl-h             [test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1]
 minmax              [test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1]
 stdbool-h           [test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1]
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -34,7 +34,7 @@ string-h
 strings-h
 sys_file-h
 sys_ioctl-h
-sys_random
+sys_random-h
 sys_resource
 sys_select
 sys_socket
--- a/modules/sys_random
+++ b/modules/sys_random
@@ -1,46 +1,20 @@
 Description:
 A GNU-like <sys/random.h>.

+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'sys_random-h' instead.
+
 Files:
-lib/sys_random.in.h
-m4/sys_random_h.m4

 Depends-on:
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
+sys_random-h

 configure.ac:
-gl_SYS_RANDOM_H
-gl_SYS_RANDOM_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P

 Makefile.am:
-BUILT_SOURCES += sys/random.h
-
-# We need the following in order to create <sys/random.h> when the system
-# doesn't have one.
-sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_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|@''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_RANDOM_H''@|$(NEXT_SYS_RANDOM_H)|g' \
-	      -e 's|@''HAVE_SYS_RANDOM_H''@|$(HAVE_SYS_RANDOM_H)|g' \
-	      -e 's/@''GNULIB_GETRANDOM''@/$(GNULIB_GETRANDOM)/g' \
-	      -e 's/@''HAVE_GETRANDOM''@/$(HAVE_GETRANDOM)/g' \
-	      -e 's/@''REPLACE_GETRANDOM''@/$(REPLACE_GETRANDOM)/g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      $(srcdir)/sys_random.in.h > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += sys/random.h sys/random.h-t
-MOSTLYCLEANDIRS += sys

 Include:
 <sys/random.h>
@@ -49,4 +23,3 @@ License:
 LGPLv2+

 Maintainer:
-all
--- a/modules/sys_random-c++-tests
+++ b/modules/sys_random-c++-tests
@@ -1,19 +0,0 @@
-Files:
-tests/test-sys_random-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-sys_random-c++
-check_PROGRAMS += test-sys_random-c++
-test_sys_random_c___SOURCES = test-sys_random-c++.cc
-test_sys_random_c___LDADD = $(LDADD) $(GETRANDOM_LIB)
-endif
--- a/modules/sys_random-h
+++ b/modules/sys_random-h
@@ -0,0 +1,52 @@
+Description:
+A GNU-like <sys/random.h>.
+
+Files:
+lib/sys_random.in.h
+m4/sys_random_h.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+
+configure.ac:
+gl_SYS_RANDOM_H
+gl_SYS_RANDOM_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += sys/random.h
+
+# We need the following in order to create <sys/random.h> when the system
+# doesn't have one.
+sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_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|@''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_RANDOM_H''@|$(NEXT_SYS_RANDOM_H)|g' \
+	      -e 's|@''HAVE_SYS_RANDOM_H''@|$(HAVE_SYS_RANDOM_H)|g' \
+	      -e 's/@''GNULIB_GETRANDOM''@/$(GNULIB_GETRANDOM)/g' \
+	      -e 's/@''HAVE_GETRANDOM''@/$(HAVE_GETRANDOM)/g' \
+	      -e 's/@''REPLACE_GETRANDOM''@/$(REPLACE_GETRANDOM)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      $(srcdir)/sys_random.in.h > $@-t
+	$(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += sys/random.h sys/random.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+<sys/random.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
--- a/modules/sys_random-h-c++-tests
+++ b/modules/sys_random-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-sys_random-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-sys_random-h-c++
+check_PROGRAMS += test-sys_random-h-c++
+test_sys_random_h_c___SOURCES = test-sys_random-h-c++.cc
+test_sys_random_h_c___LDADD = $(LDADD) $(GETRANDOM_LIB)
+endif
--- a/modules/sys_random-h-tests
+++ b/modules/sys_random-h-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-sys_random-h.c
+
+Depends-on:
+sys_random-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-sys_random-h
+check_PROGRAMS += test-sys_random-h
--- a/modules/sys_random-tests
+++ b/modules/sys_random-tests
@@ -1,11 +0,0 @@
-Files:
-tests/test-sys_random.c
-
-Depends-on:
-sys_random-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-sys_random
-check_PROGRAMS += test-sys_random
--- a/tests/test-sys_random-h-c++.cc
+++ b/tests/test-sys_random-h-c++.cc
--- a/tests/test-sys_random-h.c
+++ b/tests/test-sys_random-h.c