Skip to content

Commit 94ac078

Browse files
committed
Don't use gnulib getopt if we can avoid it
I get build failures on Fedora 42 otherwise Assisted-by: Cursor
1 parent 861f372 commit 94ac078

3 files changed

Lines changed: 7 additions & 15 deletions

File tree

‎lib/.gitignore‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@
2020
/filename.h
2121
/fstat.c
2222
/getdtablesize.c
23-
/getopt-cdefs.in.h
24-
/getopt-core.h
25-
/getopt-ext.h
26-
/getopt-pfx-core.h
27-
/getopt-pfx-ext.h
28-
/getopt.c
29-
/getopt.in.h
30-
/getopt1.c
31-
/getopt_int.h
3223
/getprogname.c
3324
/getprogname.h
3425
/gettext.h
@@ -73,3 +64,7 @@
7364
/xalloc-oversized.h
7465
/getdelim.c
7566
/getline.c
67+
/fseterr.c
68+
/fseterr.h
69+
/stdio-consolesafe.c
70+
/stdio-impl.h

‎m4/.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
/fcntl_h.m4
2020
/fstat.m4
2121
/getdtablesize.m4
22-
/getopt.m4
2322
/getprogname.m4
2423
/gnulib-common.m4
2524
/gnulib-comp.m4
@@ -38,7 +37,6 @@
3837
/msvc-nothrow.m4
3938
/multiarch.m4
4039
/musl.m4
41-
/nocrash.m4
4240
/off64_t.m4
4341
/off_t.m4
4442
/open-cloexec.m4
@@ -57,7 +55,6 @@
5755
/stdlib_h.m4
5856
/strerror.m4
5957
/string_h.m4
60-
/sys_cdefs_h.m4
6158
/sys_socket_h.m4
6259
/sys_stat_h.m4
6360
/sys_types_h.m4
@@ -69,3 +66,5 @@
6966
/zzgnulib.m4
7067
/getdelim.m4
7168
/getline.m4
69+
/fseterr.m4
70+
/gettext_h.m4

‎m4/gnulib-cache.m4‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@
3838
# --no-libtool \
3939
# --macro-prefix=gl \
4040
# error \
41-
# getline \
42-
# getopt-gnu
41+
# getline
4342

4443
# Specification in the form of a few gnulib-tool.m4 macro invocations:
4544
gl_LOCAL_DIR([])
4645
gl_MODULES([
4746
error
4847
getline
49-
getopt-gnu
5048
])
5149
gl_AVOID([])
5250
gl_SOURCE_BASE([lib])

0 commit comments

Comments
 (0)