* Toolchain Update August 2024
@ 2024-08-19 10:05 Michael Tremer
2024-08-19 10:05 ` [PATCH 01/19] expect: Fix build with GCC 14.2 Michael Tremer
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 684 bytes --]
Hello everyone,
this is the latest toolchain update which updates us to glibc 2.40 and
GCC 14.2.
Although there have not been many changes in glibc this time, GCC
brought a lot of changes with it that caused loads of packages fail to
build. In thie release, GCC is much stricter about implicit function
declarations, missing headers and type casts. Hopefully we won't walk
into too much trouble updating any packages in the future.
This patchset includes a couple of fixes that are required to build with
GCC 14.2 and I have already cherry-picked quite a few more into next.
As Core Update 188 is already quite large, this is quite likely to be
merged into 189.
Best,
-Michael
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 01/19] expect: Fix build with GCC 14.2
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
@ 2024-08-19 10:05 ` Michael Tremer
2024-08-19 10:05 ` [PATCH 02/19] coreutils: Drop uname patch Michael Tremer
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 9481 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/expect | 1 +
src/patches/expect-5.45.4-gcc14-1.patch | 288 ++++++++++++++++++++++++
2 files changed, 289 insertions(+)
create mode 100644 src/patches/expect-5.45.4-gcc14-1.patch
diff --git a/lfs/expect b/lfs/expect
index 459da1c53..d698b3f29 100644
--- a/lfs/expect
+++ b/lfs/expect
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/tcl* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/expect-5.45.4-gcc14-1.patch
cd $(DIR_APP) && ./configure \
--prefix=$(TOOLS_DIR) \
--build=$(BUILDTARGET) \
diff --git a/src/patches/expect-5.45.4-gcc14-1.patch b/src/patches/expect-5.45.4-gcc14-1.patch
new file mode 100644
index 000000000..e2a34df2e
--- /dev/null
+++ b/src/patches/expect-5.45.4-gcc14-1.patch
@@ -0,0 +1,288 @@
+Submitted By: Xi Ruoyao <xry111(a)xry111.site>
+Date: 2024-04-07
+Initial Package Version: 5.45.4
+Upstream Status: Submitted (for a long time), but the upstream seems
+ inactive
+Origin: Fedora & Self:
+ - Fedora expect-5.45.4-covscan-fixes.patch
+ - Fedora expect-c99.patch
+ - Fedora expect-configure-c99.patch
+ - We are directly patching configure instead of
+ patching configure.in like Fedora. It's
+ generally not a good idea, but better than
+ adding autoconf into chapter 7 or bloating this
+ patch into 100+ KiB (with a full regeneration
+ of the configure script).
+Description: Fix some build failure caused by the pre-C99 syntax
+ no longer allowed by GCC 14 in the default C99
+ mode.
+
+--- a/configure 2018-02-04 18:43:58.000000000 +0800
++++ b/configure 2024-04-08 01:19:29.253548373 +0800
+@@ -7994,7 +7994,6 @@
+ {
+ extern long timezone;
+ timezone += 1;
+- exit (0);
+ ;
+ return 0;
+ }
+@@ -8030,7 +8029,6 @@
+ {
+ extern time_t timezone;
+ timezone += 1;
+- exit (0);
+ ;
+ return 0;
+ }
+@@ -8791,7 +8789,7 @@
+ $as_echo_n "checking for memcpy... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-
++#include <string.h>
+ int
+ main ()
+ {
+@@ -8831,7 +8829,7 @@
+ /* end confdefs.h. */
+
+ #include <sys/wait.h>
+-main() {
++int main() {
+ #ifndef WNOHANG
+ return 0;
+ #else
+@@ -8867,7 +8865,7 @@
+
+ #include <stdio.h>
+ #include <sys/wait.h>
+-main() {
++int main() {
+ #ifdef WNOHANG
+ FILE *fp = fopen("wnohang","w");
+ fprintf(fp,"%d",WNOHANG);
+@@ -8935,7 +8933,9 @@
+ /* end confdefs.h. */
+
+ #include <signal.h>
+-#define RETSIGTYPE $retsigtype
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/wait.h>
+
+ int signal_rearms = 0;
+
+@@ -8952,7 +8952,7 @@
+ signal_rearms++;
+ }
+
+-main()
++int main()
+ {
+ signal(SIGINT,parent_sigint_handler);
+
+@@ -9234,10 +9234,9 @@
+ /* end confdefs.h. */
+
+ #include <sgtty.h>
+-main()
++int main()
+ {
+ struct sgttyb tmp;
+- exit(0);
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+@@ -9274,10 +9273,9 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <termio.h>
+- main()
++ int main()
+ {
+ struct termio tmp;
+- exit(0);
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+@@ -9312,10 +9310,9 @@
+ # include <inttypes.h>
+ # endif
+ # include <termios.h>
+- main()
++ int main()
+ {
+ struct termios tmp;
+- exit(0);
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+@@ -9350,7 +9347,7 @@
+ #include <inttypes.h>
+ #endif
+ #include <termios.h>
+-main() {
++int main() {
+ #if defined(TCGETS) || defined(TCGETA)
+ return 0;
+ #else
+@@ -9388,7 +9385,7 @@
+ #include <inttypes.h>
+ #endif
+ #include <termios.h>
+-main() {
++int main() {
+ #ifdef TIOCGWINSZ
+ return 0;
+ #else
+@@ -9423,7 +9420,7 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-main(){
++int main(){
+ #ifdef CRAY
+ return 0;
+ #else
+@@ -9565,12 +9562,10 @@
+
+ extern char *tzname[2];
+ extern int daylight;
+-main()
++int main()
+ {
+ int *x = &daylight;
+ char **y = tzname;
+-
+- exit(0);
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+--- a/exp_chan.c 2018-02-03 03:15:52.000000000 +0800
++++ b/exp_chan.c 2024-04-07 21:56:43.663163369 +0800
+@@ -58,7 +58,7 @@
+
+ Tcl_ChannelType expChannelType = {
+ "exp", /* Type name. */
+- ExpBlockModeProc, /* Set blocking/nonblocking mode.*/
++ TCL_CHANNEL_VERSION_2,
+ ExpCloseProc, /* Close proc. */
+ ExpInputProc, /* Input proc. */
+ ExpOutputProc, /* Output proc. */
+@@ -68,6 +68,7 @@
+ ExpWatchProc, /* Initialize notifier. */
+ ExpGetHandleProc, /* Get OS handles out of channel. */
+ NULL, /* Close2 proc */
++ ExpBlockModeProc, /* Set blocking/nonblocking mode.*/
+ };
+
+ typedef struct ThreadSpecificData {
+
+diff -up expect5.45.4/exp_chan.c.orig expect5.45.4/exp_chan.c
+--- expect5.45.4/exp_chan.c.orig 2018-02-02 20:15:52.000000000 +0100
++++ expect5.45.4/exp_chan.c 2018-10-09 14:14:44.851965292 +0200
+@@ -51,6 +51,8 @@ static void ExpWatchProc _ANSI_ARGS_((C
+ int mask));
+ static int ExpGetHandleProc _ANSI_ARGS_((ClientData instanceData,
+ int direction, ClientData *handlePtr));
++void exp_background_channelhandler _ANSI_ARGS_((ClientData,
++ int));
+
+ /*
+ * This structure describes the channel type structure for Expect-based IO:
+diff -up expect5.45.4/exp_clib.c.orig expect5.45.4/exp_clib.c
+--- expect5.45.4/exp_clib.c.orig 2018-10-09 14:14:44.841965281 +0200
++++ expect5.45.4/exp_clib.c 2018-10-09 14:14:44.873965319 +0200
+@@ -37,6 +37,14 @@ would appreciate credit if this program
+ # endif
+ #endif
+
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++
++//#ifdef HAVE_SYS_WAIT_H
++# include <sys/wait.h>
++//#endif
++
+ #ifdef HAVE_SYS_FCNTL_H
+ # include <sys/fcntl.h>
+ #else
+@@ -2196,6 +2204,7 @@ int exp_getptyslave();
+ #define sysreturn(x) return(errno = x, -1)
+
+ void exp_init_pty();
++void exp_init_tty();
+
+ /*
+ The following functions are linked from the Tcl library. They
+@@ -2715,6 +2724,7 @@ exp_spawnl TCL_VARARGS_DEF(char *,arg1)
+ argv[i] = va_arg(args,char *);
+ if (!argv[i]) break;
+ }
++ va_end(args);
+ i = exp_spawnv(argv[0],argv+1);
+ free((char *)argv);
+ return(i);
+@@ -3188,6 +3198,7 @@ exp_expectl TCL_VARARGS_DEF(int,arg1)
+ /* Ultrix 4.2 compiler refuses enumerations comparison!? */
+ if ((int)type < 0 || (int)type >= (int)exp_bogus) {
+ fprintf(stderr,"bad type (set %d) in exp_expectl\n",i);
++ va_end(args);
+ sysreturn(EINVAL);
+ }
+
+@@ -3253,6 +3264,7 @@ exp_fexpectl TCL_VARARGS_DEF(FILE *,arg1
+ /* Ultrix 4.2 compiler refuses enumerations comparison!? */
+ if ((int)type < 0 || (int)type >= (int)exp_bogus) {
+ fprintf(stderr,"bad type (set %d) in exp_expectl\n",i);
++ va_end(args);
+ sysreturn(EINVAL);
+ }
+
+diff -up expect5.45.4/exp_log.c.orig expect5.45.4/exp_log.c
+--- expect5.45.4/exp_log.c.orig 2018-10-09 14:14:44.838965277 +0200
++++ expect5.45.4/exp_log.c 2018-10-09 14:14:44.852965294 +0200
+@@ -174,7 +174,10 @@ expStdoutLog TCL_VARARGS_DEF(int,arg1)
+ force_stdout = TCL_VARARGS_START(int,arg1,args);
+ fmt = va_arg(args,char *);
+
+- if ((!tsdPtr->logUser) && (!force_stdout) && (!tsdPtr->logAll)) return;
++ if ((!tsdPtr->logUser) && (!force_stdout) && (!tsdPtr->logAll)) {
++ va_end(args);
++ return;
++ }
+
+ (void) vsnprintf(bigbuf,sizeof(bigbuf),fmt,args);
+ expDiagWriteBytes(bigbuf,-1);
+diff -up expect5.45.4/exp_main_sub.c.orig expect5.45.4/exp_main_sub.c
+--- expect5.45.4/exp_main_sub.c.orig 2018-10-09 14:14:44.848965289 +0200
++++ expect5.45.4/exp_main_sub.c 2018-10-09 14:14:44.852965294 +0200
+@@ -57,6 +57,7 @@ int exp_cmdlinecmds = FALSE;
+ int exp_interactive = FALSE;
+ int exp_buffer_command_input = FALSE;/* read in entire cmdfile at once */
+ int exp_fgets();
++int exp_tty_cooked_echo(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
+
+ Tcl_Interp *exp_interp; /* for use by signal handlers who can't figure out */
+ /* the interpreter directly */
+diff -up expect5.45.4/pty_termios.c.orig expect5.45.4/pty_termios.c
+--- expect5.45.4/pty_termios.c.orig 2018-10-09 14:17:00.132127498 +0200
++++ expect5.45.4/pty_termios.c 2018-10-09 14:33:59.393315570 +0200
+@@ -105,6 +105,7 @@ with openpty which supports 4000 while p
+
+ void expDiagLog();
+ void expDiagLogPtr();
++char *expErrnoMsg(int errorNo);
+
+ #include <errno.h>
+ /*extern char *sys_errlist[];*/
+@@ -189,6 +190,7 @@ static char slave_name[MAXPTYNAMELEN];
+ #endif /* HAVE_SCO_CLIST_PTYS */
+
+ #ifdef HAVE_OPENPTY
++#include <pty.h>
+ static char master_name[64];
+ static char slave_name[64];
+ #endif
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 02/19] coreutils: Drop uname patch
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
2024-08-19 10:05 ` [PATCH 01/19] expect: Fix build with GCC 14.2 Michael Tremer
@ 2024-08-19 10:05 ` Michael Tremer
2024-08-19 10:05 ` [PATCH 03/19] glibc: Update to 2.40 Michael Tremer
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6208 bytes --]
This is a patch that has been backported from Gentoo for quite a while
now. However, I did not forget why. And now it won't build with GCC 14,
and since I don't remember why we needed this, I would rather drop it.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/coreutils | 1 -
.../coreutils/coreutils-9.5-uname-1.patch | 170 ------------------
2 files changed, 171 deletions(-)
delete mode 100644 src/patches/coreutils/coreutils-9.5-uname-1.patch
diff --git a/lfs/coreutils b/lfs/coreutils
index eea5fb451..c7879508a 100644
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -88,7 +88,6 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils/coreutils-9.5-uname-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils/coreutils-9.5-i18n-2.patch
cd $(DIR_APP) && FORCE_UNSAFE_CONFIGURE=1 && ./configure $(CONFIGURE_OPTIONS)
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/src/patches/coreutils/coreutils-9.5-uname-1.patch b/src/patches/coreutils/coreutils-9.5-uname-1.patch
deleted file mode 100644
index 38c920dfc..000000000
--- a/src/patches/coreutils/coreutils-9.5-uname-1.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Submitted by: DJ Lucas (dj_at_linuxfromscratch_dot_org)
-Date: 2012-04-21
-Initial Package Version: 8.16
-Upstream Status: Rejected
-Origin: Based on Gentoo patch
-Description: Makes uname -m output more descriptive
-
-Updated to version 9.5
-
---- coreutils-9.5.orig/src/uname.c 2024-01-01 14:27:23.000000000 +0100
-+++ coreutils-9.5/src/uname.c 2024-07-09 21:14:56.460778557 +0200
-@@ -43,6 +43,10 @@
- # endif
- # endif
- #endif
-+#if defined(__linux__)
-+# define USE_PROCINFO
-+# define UNAME_HARDWARE_PLATFORM
-+#endif
-
- #include "system.h"
- #include "quote.h"
-@@ -146,6 +150,116 @@
- }
- exit (status);
- }
-+#if defined(USE_PROCINFO)
-+
-+# if defined(__s390__) || defined(__s390x__)
-+# define CPUINFO_FILE "/proc/sysinfo"
-+# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c"
-+# else
-+# define CPUINFO_FILE "/proc/cpuinfo"
-+# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c"
-+# endif
-+
-+# define PROCINFO_PROCESSOR 0
-+# define PROCINFO_HARDWARE_PLATFORM 1
-+
-+static void __eat_cpuinfo_space(char *buf)
-+{
-+ /* first eat trailing space */
-+ char *tmp = buf + strlen(buf) - 1;
-+ while (tmp > buf && isspace(*tmp))
-+ *tmp-- = '\0';
-+ /* then eat leading space */
-+ tmp = buf;
-+ while (*tmp && isspace(*tmp))
-+ tmp++;
-+ if (tmp != buf)
-+ memmove(buf, tmp, strlen(tmp)+1);
-+ /* finally collapse whitespace */
-+ tmp = buf;
-+ while (tmp[0] && tmp[1]) {
-+ if (isspace(tmp[0]) && isspace(tmp[1])) {
-+ memmove(tmp, tmp+1, strlen(tmp));
-+ continue;
-+ }
-+ ++tmp;
-+ }
-+}
-+
-+static int __linux_procinfo(int x, char *fstr, size_t s)
-+{
-+ FILE *fp;
-+
-+ char *procinfo_keys[] = {
-+ /* --processor --hardware-platform */
-+ #if defined(__alpha__)
-+ "cpu model", "system type"
-+ #elif defined(__arm__)
-+ "Processor", "Hardware"
-+ #elif defined(__avr32__)
-+ "processor", "cpu family"
-+ #elif defined(__bfin__)
-+ "CPU", "BOARD Name"
-+ #elif defined(__cris__)
-+ "cpu", "cpu model"
-+ #elif defined(__frv__)
-+ "CPU-Core", "System"
-+ #elif defined(__i386__) || defined(__x86_64__)
-+ "model name", "vendor_id"
-+ #elif defined(__ia64__)
-+ "family", "vendor"
-+ #elif defined(__hppa__)
-+ "cpu", "model"
-+ #elif defined(__m68k__)
-+ "CPU", "MMU"
-+ #elif defined(__mips__)
-+ "cpu model", "system type"
-+ #elif defined(__powerpc__) || defined(__powerpc64__)
-+ "cpu", "machine"
-+ #elif defined(__s390__) || defined(__s390x__)
-+ "Type", "Manufacturer"
-+ #elif defined(__sh__)
-+ "cpu type", "machine"
-+ #elif defined(sparc) || defined(__sparc__)
-+ "type", "cpu"
-+ #elif defined(__vax__)
-+ "cpu type", "cpu"
-+ #else
-+ "unknown", "unknown"
-+ #endif
-+ };
-+
-+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
-+ char key[65], value[257], eol, *ret = NULL;
-+
-+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
-+ __eat_cpuinfo_space(key);
-+ if (!strcmp(key, procinfo_keys[x])) {
-+ __eat_cpuinfo_space(value);
-+ ret = value;
-+ break;
-+ }
-+ if (eol != '\n') {
-+ /* we need two fscanf's here in case the previous
-+ * length limit caused us to read right up to the
-+ * newline ... doing "%*[^\n]\n" wont eat the newline
-+ */
-+ fscanf(fp, "%*[^\n]");
-+ fscanf(fp, "\n");
-+ }
-+ }
-+ fclose(fp);
-+
-+ if (ret) {
-+ strncpy(fstr, ret, s);
-+ return 0;
-+ }
-+ }
-+
-+ return -1;
-+}
-+
-+#endif
-
- /* Print ELEMENT, preceded by a space if something has already been
- printed. */
-@@ -323,11 +437,15 @@
- element = "powerpc";
- # endif
- #endif
--#if HAVE_SYSINFO && defined SI_ARCHITECTURE
-+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
- if (element == unknown)
- {
- static char processor[257];
-+#if defined(USE_PROCINFO)
-+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
-+#else
- if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+#endif
- element = processor;
- }
- #endif
-@@ -360,9 +478,13 @@
- if (element == unknown)
- {
- static char hardware_platform[257];
-+#if defined(USE_PROCINFO)
-+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
-+#else
- size_t s = sizeof hardware_platform;
- static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
- if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
-+#endif
- element = hardware_platform;
- }
- #endif
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 03/19] glibc: Update to 2.40
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
2024-08-19 10:05 ` [PATCH 01/19] expect: Fix build with GCC 14.2 Michael Tremer
2024-08-19 10:05 ` [PATCH 02/19] coreutils: Drop uname patch Michael Tremer
@ 2024-08-19 10:05 ` Michael Tremer
2024-08-19 10:05 ` [PATCH 04/19] make.sh: Bump the toolchain version Michael Tremer
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 12292 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/aarch64/glibc | 47 ++++++++++++++++++++++++-
config/rootfiles/common/riscv64/glibc | 49 ++++++++++++++++++++++++++-
config/rootfiles/common/x86_64/glibc | 47 ++++++++++++++++++++++++-
lfs/glibc | 4 +--
4 files changed, 142 insertions(+), 5 deletions(-)
diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc
index 99481d6b3..d91e55c79 100644
--- a/config/rootfiles/common/aarch64/glibc
+++ b/config/rootfiles/common/aarch64/glibc
@@ -812,7 +812,7 @@ usr/lib/gconv
#usr/lib/libc_nonshared.a
#usr/lib/libdl.a
#usr/lib/libg.a
-#usr/lib/libm-2.39.a
+#usr/lib/libm-2.40.a
#usr/lib/libm.a
#usr/lib/libm.so
#usr/lib/libmcheck.a
@@ -5182,6 +5182,20 @@ usr/lib/locale
#usr/lib/locale/lt_LT/LC_PAPER
#usr/lib/locale/lt_LT/LC_TELEPHONE
#usr/lib/locale/lt_LT/LC_TIME
+#usr/lib/locale/ltg_LV.utf8
+#usr/lib/locale/ltg_LV.utf8/LC_ADDRESS
+#usr/lib/locale/ltg_LV.utf8/LC_COLLATE
+#usr/lib/locale/ltg_LV.utf8/LC_CTYPE
+#usr/lib/locale/ltg_LV.utf8/LC_IDENTIFICATION
+#usr/lib/locale/ltg_LV.utf8/LC_MEASUREMENT
+#usr/lib/locale/ltg_LV.utf8/LC_MESSAGES
+#usr/lib/locale/ltg_LV.utf8/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ltg_LV.utf8/LC_MONETARY
+#usr/lib/locale/ltg_LV.utf8/LC_NAME
+#usr/lib/locale/ltg_LV.utf8/LC_NUMERIC
+#usr/lib/locale/ltg_LV.utf8/LC_PAPER
+#usr/lib/locale/ltg_LV.utf8/LC_TELEPHONE
+#usr/lib/locale/ltg_LV.utf8/LC_TIME
#usr/lib/locale/lv_LV
#usr/lib/locale/lv_LV.utf8
#usr/lib/locale/lv_LV.utf8/LC_ADDRESS
@@ -5266,6 +5280,20 @@ usr/lib/locale
#usr/lib/locale/mai_NP/LC_PAPER
#usr/lib/locale/mai_NP/LC_TELEPHONE
#usr/lib/locale/mai_NP/LC_TIME
+#usr/lib/locale/mdf_RU
+#usr/lib/locale/mdf_RU/LC_ADDRESS
+#usr/lib/locale/mdf_RU/LC_COLLATE
+#usr/lib/locale/mdf_RU/LC_CTYPE
+#usr/lib/locale/mdf_RU/LC_IDENTIFICATION
+#usr/lib/locale/mdf_RU/LC_MEASUREMENT
+#usr/lib/locale/mdf_RU/LC_MESSAGES
+#usr/lib/locale/mdf_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mdf_RU/LC_MONETARY
+#usr/lib/locale/mdf_RU/LC_NAME
+#usr/lib/locale/mdf_RU/LC_NUMERIC
+#usr/lib/locale/mdf_RU/LC_PAPER
+#usr/lib/locale/mdf_RU/LC_TELEPHONE
+#usr/lib/locale/mdf_RU/LC_TIME
#usr/lib/locale/mfe_MU
#usr/lib/locale/mfe_MU/LC_ADDRESS
#usr/lib/locale/mfe_MU/LC_COLLATE
@@ -6316,6 +6344,20 @@ usr/lib/locale
#usr/lib/locale/sc_IT/LC_PAPER
#usr/lib/locale/sc_IT/LC_TELEPHONE
#usr/lib/locale/sc_IT/LC_TIME
+#usr/lib/locale/scn_IT
+#usr/lib/locale/scn_IT/LC_ADDRESS
+#usr/lib/locale/scn_IT/LC_COLLATE
+#usr/lib/locale/scn_IT/LC_CTYPE
+#usr/lib/locale/scn_IT/LC_IDENTIFICATION
+#usr/lib/locale/scn_IT/LC_MEASUREMENT
+#usr/lib/locale/scn_IT/LC_MESSAGES
+#usr/lib/locale/scn_IT/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/scn_IT/LC_MONETARY
+#usr/lib/locale/scn_IT/LC_NAME
+#usr/lib/locale/scn_IT/LC_NUMERIC
+#usr/lib/locale/scn_IT/LC_PAPER
+#usr/lib/locale/scn_IT/LC_TELEPHONE
+#usr/lib/locale/scn_IT/LC_TIME
#usr/lib/locale/sd_IN
#usr/lib/locale/sd_IN/LC_ADDRESS
#usr/lib/locale/sd_IN/LC_COLLATE
@@ -8239,11 +8281,13 @@ usr/lib/locale
#usr/share/i18n/locales/ln_CD
#usr/share/i18n/locales/lo_LA
#usr/share/i18n/locales/lt_LT
+#usr/share/i18n/locales/ltg_LV
#usr/share/i18n/locales/lv_LV
#usr/share/i18n/locales/lzh_TW
#usr/share/i18n/locales/mag_IN
#usr/share/i18n/locales/mai_IN
#usr/share/i18n/locales/mai_NP
+#usr/share/i18n/locales/mdf_RU
#usr/share/i18n/locales/mfe_MU
#usr/share/i18n/locales/mg_MG
#usr/share/i18n/locales/mhr_RU
@@ -8301,6 +8345,7 @@ usr/lib/locale
#usr/share/i18n/locales/sah_RU
#usr/share/i18n/locales/sat_IN
#usr/share/i18n/locales/sc_IT
+#usr/share/i18n/locales/scn_IT
#usr/share/i18n/locales/sd_IN
#usr/share/i18n/locales/sd_IN(a)devanagari
#usr/share/i18n/locales/se_NO
diff --git a/config/rootfiles/common/riscv64/glibc b/config/rootfiles/common/riscv64/glibc
index 1ee4b92bd..caab864d9 100644
--- a/config/rootfiles/common/riscv64/glibc
+++ b/config/rootfiles/common/riscv64/glibc
@@ -124,7 +124,6 @@ usr/bin/locale
#usr/include/bits/param.h
#usr/include/bits/poll.h
#usr/include/bits/poll2.h
-#usr/include/bits/platform/features.h
#usr/include/bits/posix1_lim.h
#usr/include/bits/posix2_lim.h
#usr/include/bits/posix_opt.h
@@ -444,6 +443,7 @@ usr/bin/locale
#usr/include/sys/fsuid.h
#usr/include/sys/gmon.h
#usr/include/sys/gmon_out.h
+#usr/include/sys/hwprobe.h
#usr/include/sys/inotify.h
#usr/include/sys/ioctl.h
#usr/include/sys/ipc.h
@@ -800,6 +800,7 @@ usr/lib/gconv
#usr/lib/glibc/getconf/POSIX_V6_LP64_OFF64
#usr/lib/glibc/getconf/POSIX_V7_LP64_OFF64
#usr/lib/glibc/getconf/XBS5_LP64_OFF64
+#usr/lib/grcrt1.o
#usr/lib/libBrokenLocale.a
#usr/lib/libBrokenLocale.so
#usr/lib/libanl.a
@@ -5177,6 +5178,20 @@ usr/lib/locale
#usr/lib/locale/lt_LT/LC_PAPER
#usr/lib/locale/lt_LT/LC_TELEPHONE
#usr/lib/locale/lt_LT/LC_TIME
+#usr/lib/locale/ltg_LV.utf8
+#usr/lib/locale/ltg_LV.utf8/LC_ADDRESS
+#usr/lib/locale/ltg_LV.utf8/LC_COLLATE
+#usr/lib/locale/ltg_LV.utf8/LC_CTYPE
+#usr/lib/locale/ltg_LV.utf8/LC_IDENTIFICATION
+#usr/lib/locale/ltg_LV.utf8/LC_MEASUREMENT
+#usr/lib/locale/ltg_LV.utf8/LC_MESSAGES
+#usr/lib/locale/ltg_LV.utf8/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ltg_LV.utf8/LC_MONETARY
+#usr/lib/locale/ltg_LV.utf8/LC_NAME
+#usr/lib/locale/ltg_LV.utf8/LC_NUMERIC
+#usr/lib/locale/ltg_LV.utf8/LC_PAPER
+#usr/lib/locale/ltg_LV.utf8/LC_TELEPHONE
+#usr/lib/locale/ltg_LV.utf8/LC_TIME
#usr/lib/locale/lv_LV
#usr/lib/locale/lv_LV.utf8
#usr/lib/locale/lv_LV.utf8/LC_ADDRESS
@@ -5261,6 +5276,20 @@ usr/lib/locale
#usr/lib/locale/mai_NP/LC_PAPER
#usr/lib/locale/mai_NP/LC_TELEPHONE
#usr/lib/locale/mai_NP/LC_TIME
+#usr/lib/locale/mdf_RU
+#usr/lib/locale/mdf_RU/LC_ADDRESS
+#usr/lib/locale/mdf_RU/LC_COLLATE
+#usr/lib/locale/mdf_RU/LC_CTYPE
+#usr/lib/locale/mdf_RU/LC_IDENTIFICATION
+#usr/lib/locale/mdf_RU/LC_MEASUREMENT
+#usr/lib/locale/mdf_RU/LC_MESSAGES
+#usr/lib/locale/mdf_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mdf_RU/LC_MONETARY
+#usr/lib/locale/mdf_RU/LC_NAME
+#usr/lib/locale/mdf_RU/LC_NUMERIC
+#usr/lib/locale/mdf_RU/LC_PAPER
+#usr/lib/locale/mdf_RU/LC_TELEPHONE
+#usr/lib/locale/mdf_RU/LC_TIME
#usr/lib/locale/mfe_MU
#usr/lib/locale/mfe_MU/LC_ADDRESS
#usr/lib/locale/mfe_MU/LC_COLLATE
@@ -6311,6 +6340,20 @@ usr/lib/locale
#usr/lib/locale/sc_IT/LC_PAPER
#usr/lib/locale/sc_IT/LC_TELEPHONE
#usr/lib/locale/sc_IT/LC_TIME
+#usr/lib/locale/scn_IT
+#usr/lib/locale/scn_IT/LC_ADDRESS
+#usr/lib/locale/scn_IT/LC_COLLATE
+#usr/lib/locale/scn_IT/LC_CTYPE
+#usr/lib/locale/scn_IT/LC_IDENTIFICATION
+#usr/lib/locale/scn_IT/LC_MEASUREMENT
+#usr/lib/locale/scn_IT/LC_MESSAGES
+#usr/lib/locale/scn_IT/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/scn_IT/LC_MONETARY
+#usr/lib/locale/scn_IT/LC_NAME
+#usr/lib/locale/scn_IT/LC_NUMERIC
+#usr/lib/locale/scn_IT/LC_PAPER
+#usr/lib/locale/scn_IT/LC_TELEPHONE
+#usr/lib/locale/scn_IT/LC_TIME
#usr/lib/locale/sd_IN
#usr/lib/locale/sd_IN/LC_ADDRESS
#usr/lib/locale/sd_IN/LC_COLLATE
@@ -7781,6 +7824,7 @@ usr/lib/locale
#usr/lib/locale/zu_ZA/LC_PAPER
#usr/lib/locale/zu_ZA/LC_TELEPHONE
#usr/lib/locale/zu_ZA/LC_TIME
+#usr/lib/rcrt1.o
#usr/sbin/iconvconfig
#usr/sbin/zic
#usr/share/i18n
@@ -8233,11 +8277,13 @@ usr/lib/locale
#usr/share/i18n/locales/ln_CD
#usr/share/i18n/locales/lo_LA
#usr/share/i18n/locales/lt_LT
+#usr/share/i18n/locales/ltg_LV
#usr/share/i18n/locales/lv_LV
#usr/share/i18n/locales/lzh_TW
#usr/share/i18n/locales/mag_IN
#usr/share/i18n/locales/mai_IN
#usr/share/i18n/locales/mai_NP
+#usr/share/i18n/locales/mdf_RU
#usr/share/i18n/locales/mfe_MU
#usr/share/i18n/locales/mg_MG
#usr/share/i18n/locales/mhr_RU
@@ -8295,6 +8341,7 @@ usr/lib/locale
#usr/share/i18n/locales/sah_RU
#usr/share/i18n/locales/sat_IN
#usr/share/i18n/locales/sc_IT
+#usr/share/i18n/locales/scn_IT
#usr/share/i18n/locales/sd_IN
#usr/share/i18n/locales/sd_IN(a)devanagari
#usr/share/i18n/locales/se_NO
diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc
index 929a8f660..9f97485dc 100644
--- a/config/rootfiles/common/x86_64/glibc
+++ b/config/rootfiles/common/x86_64/glibc
@@ -820,7 +820,7 @@ usr/lib/gconv
#usr/lib/libc_nonshared.a
#usr/lib/libdl.a
#usr/lib/libg.a
-#usr/lib/libm-2.39.a
+#usr/lib/libm-2.40.a
#usr/lib/libm.a
#usr/lib/libm.so
#usr/lib/libmcheck.a
@@ -5190,6 +5190,20 @@ usr/lib/locale
#usr/lib/locale/lt_LT/LC_PAPER
#usr/lib/locale/lt_LT/LC_TELEPHONE
#usr/lib/locale/lt_LT/LC_TIME
+#usr/lib/locale/ltg_LV.utf8
+#usr/lib/locale/ltg_LV.utf8/LC_ADDRESS
+#usr/lib/locale/ltg_LV.utf8/LC_COLLATE
+#usr/lib/locale/ltg_LV.utf8/LC_CTYPE
+#usr/lib/locale/ltg_LV.utf8/LC_IDENTIFICATION
+#usr/lib/locale/ltg_LV.utf8/LC_MEASUREMENT
+#usr/lib/locale/ltg_LV.utf8/LC_MESSAGES
+#usr/lib/locale/ltg_LV.utf8/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ltg_LV.utf8/LC_MONETARY
+#usr/lib/locale/ltg_LV.utf8/LC_NAME
+#usr/lib/locale/ltg_LV.utf8/LC_NUMERIC
+#usr/lib/locale/ltg_LV.utf8/LC_PAPER
+#usr/lib/locale/ltg_LV.utf8/LC_TELEPHONE
+#usr/lib/locale/ltg_LV.utf8/LC_TIME
#usr/lib/locale/lv_LV
#usr/lib/locale/lv_LV.utf8
#usr/lib/locale/lv_LV.utf8/LC_ADDRESS
@@ -5274,6 +5288,20 @@ usr/lib/locale
#usr/lib/locale/mai_NP/LC_PAPER
#usr/lib/locale/mai_NP/LC_TELEPHONE
#usr/lib/locale/mai_NP/LC_TIME
+#usr/lib/locale/mdf_RU
+#usr/lib/locale/mdf_RU/LC_ADDRESS
+#usr/lib/locale/mdf_RU/LC_COLLATE
+#usr/lib/locale/mdf_RU/LC_CTYPE
+#usr/lib/locale/mdf_RU/LC_IDENTIFICATION
+#usr/lib/locale/mdf_RU/LC_MEASUREMENT
+#usr/lib/locale/mdf_RU/LC_MESSAGES
+#usr/lib/locale/mdf_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mdf_RU/LC_MONETARY
+#usr/lib/locale/mdf_RU/LC_NAME
+#usr/lib/locale/mdf_RU/LC_NUMERIC
+#usr/lib/locale/mdf_RU/LC_PAPER
+#usr/lib/locale/mdf_RU/LC_TELEPHONE
+#usr/lib/locale/mdf_RU/LC_TIME
#usr/lib/locale/mfe_MU
#usr/lib/locale/mfe_MU/LC_ADDRESS
#usr/lib/locale/mfe_MU/LC_COLLATE
@@ -6324,6 +6352,20 @@ usr/lib/locale
#usr/lib/locale/sc_IT/LC_PAPER
#usr/lib/locale/sc_IT/LC_TELEPHONE
#usr/lib/locale/sc_IT/LC_TIME
+#usr/lib/locale/scn_IT
+#usr/lib/locale/scn_IT/LC_ADDRESS
+#usr/lib/locale/scn_IT/LC_COLLATE
+#usr/lib/locale/scn_IT/LC_CTYPE
+#usr/lib/locale/scn_IT/LC_IDENTIFICATION
+#usr/lib/locale/scn_IT/LC_MEASUREMENT
+#usr/lib/locale/scn_IT/LC_MESSAGES
+#usr/lib/locale/scn_IT/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/scn_IT/LC_MONETARY
+#usr/lib/locale/scn_IT/LC_NAME
+#usr/lib/locale/scn_IT/LC_NUMERIC
+#usr/lib/locale/scn_IT/LC_PAPER
+#usr/lib/locale/scn_IT/LC_TELEPHONE
+#usr/lib/locale/scn_IT/LC_TIME
#usr/lib/locale/sd_IN
#usr/lib/locale/sd_IN/LC_ADDRESS
#usr/lib/locale/sd_IN/LC_COLLATE
@@ -8247,11 +8289,13 @@ usr/lib/locale
#usr/share/i18n/locales/ln_CD
#usr/share/i18n/locales/lo_LA
#usr/share/i18n/locales/lt_LT
+#usr/share/i18n/locales/ltg_LV
#usr/share/i18n/locales/lv_LV
#usr/share/i18n/locales/lzh_TW
#usr/share/i18n/locales/mag_IN
#usr/share/i18n/locales/mai_IN
#usr/share/i18n/locales/mai_NP
+#usr/share/i18n/locales/mdf_RU
#usr/share/i18n/locales/mfe_MU
#usr/share/i18n/locales/mg_MG
#usr/share/i18n/locales/mhr_RU
@@ -8309,6 +8353,7 @@ usr/lib/locale
#usr/share/i18n/locales/sah_RU
#usr/share/i18n/locales/sat_IN
#usr/share/i18n/locales/sc_IT
+#usr/share/i18n/locales/scn_IT
#usr/share/i18n/locales/sd_IN
#usr/share/i18n/locales/sd_IN(a)devanagari
#usr/share/i18n/locales/se_NO
diff --git a/lfs/glibc b/lfs/glibc
index 43523e46f..9ac5b1f08 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,7 @@
include Config
-VER = 2.39
+VER = 2.40
THISAPP = glibc-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -82,7 +82,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 9d98459a2d58401e07c081e0d841935b23998da75a7eb5a7ebd23a1f9ebab99dee623fe166397c1b6c926960c570f62dbca5cb3b5ce84a918adff6b7a15e16bb
+$(DL_FILE)_BLAKE2 = 8593cab5b2549b77159b6866fbb40b917e491fd5bc0814f7f85b6529166d78d4583436450c479b86cdfe468304fc4d2a9ba8294230a55dbc4c15e89c3ab6c000
install : $(TARGET)
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 04/19] make.sh: Bump the toolchain version
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (2 preceding siblings ...)
2024-08-19 10:05 ` [PATCH 03/19] glibc: Update to 2.40 Michael Tremer
@ 2024-08-19 10:05 ` Michael Tremer
2024-08-19 10:05 ` [PATCH 06/19] misc-progs: Fix compilation with GCC 14 Michael Tremer
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make.sh b/make.sh
index c5936a671..1f2bb572b 100755
--- a/make.sh
+++ b/make.sh
@@ -33,7 +33,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # Git Branch
GIT_TAG="$(git tag | tail -1)" # Git Tag
GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit
-TOOLCHAINVER=20240521
+TOOLCHAINVER=20240802
###############################################################################
#
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 06/19] misc-progs: Fix compilation with GCC 14
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (3 preceding siblings ...)
2024-08-19 10:05 ` [PATCH 04/19] make.sh: Bump the toolchain version Michael Tremer
@ 2024-08-19 10:05 ` Michael Tremer
2024-08-19 10:05 ` [PATCH 07/19] whatmask: Fix build " Michael Tremer
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2901 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
src/misc-progs/openvpnctrl.c | 17 +++++++++--------
src/misc-progs/wioscan.c | 4 ++--
src/misc-progs/wirelessclient.c | 1 +
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c
index 0659aa6b1..8de6eec5c 100644
--- a/src/misc-progs/openvpnctrl.c
+++ b/src/misc-progs/openvpnctrl.c
@@ -1,3 +1,4 @@
+#define _DEFAULT_SOURCE
#define _XOPEN_SOURCE 500
#include <signal.h>
#include <stdio.h>
@@ -130,13 +131,13 @@ connection *getConnections() {
conn_last = conn_curr;
count = 0;
- char *lineptr = &line;
+ char *lineptr = line;
while (1) {
- if (*lineptr == NULL)
+ if (*lineptr == '\0')
break;
resultptr = result;
- while (*lineptr != NULL) {
+ while (*lineptr != '\0') {
if (*lineptr == ',') {
lineptr++;
break;
@@ -338,7 +339,7 @@ char* getLocalSubnetAddress(const connection* conn) {
}
const char *zones[] = {"GREEN", "BLUE", "ORANGE", NULL};
- char *zone = NULL;
+ const char *zone = NULL;
// Get net address of the local openvpn subnet.
char *subnetmask = strdup(conn->local_subnet);
@@ -458,7 +459,7 @@ void setFirewallRules(void) {
}
static void stopAuthenticator() {
- const char* argv[] = {
+ char* argv[] = {
"/usr/sbin/openvpn-authenticator",
NULL,
};
@@ -473,7 +474,7 @@ void stopDaemon(void) {
stopAuthenticator();
int pid = readPidFile("/var/run/openvpn.pid");
- if (!pid > 0) {
+ if (pid <= 0) {
exit(1);
}
@@ -485,7 +486,7 @@ void stopDaemon(void) {
}
static int startAuthenticator(void) {
- const char* argv[] = { "-d", NULL };
+ char* argv[] = { "-d", NULL };
return run("/usr/sbin/openvpn-authenticator", argv);
}
@@ -595,7 +596,7 @@ int killNet2Net(char *name) {
snprintf(pidfile, STRING_SIZE - 1, "/var/run/%sn2n.pid", conn->name);
int pid = readPidFile(pidfile);
- if (!pid > 0) {
+ if (pid <= 0) {
fprintf(stderr, "Could not read pid file of connection %s.", conn->name);
return 1;
}
diff --git a/src/misc-progs/wioscan.c b/src/misc-progs/wioscan.c
index 206456c5d..e3c163316 100644
--- a/src/misc-progs/wioscan.c
+++ b/src/misc-progs/wioscan.c
@@ -76,7 +76,7 @@ struct hwaddr {
u8 len, addr[HWMAX];
};
-static inline hw_eq(struct hwaddr *h, int hl, u8 *ha)
+static inline int hw_eq(struct hwaddr *h, int hl, u8 *ha)
{
return h->len == hl && memcmp(h->addr, ha, hl) == 0;
}
@@ -662,4 +662,4 @@ print:
q = p + 11;
goto print;
}
-}
\ No newline at end of file
+}
diff --git a/src/misc-progs/wirelessclient.c b/src/misc-progs/wirelessclient.c
index c85e5316f..9510282d9 100644
--- a/src/misc-progs/wirelessclient.c
+++ b/src/misc-progs/wirelessclient.c
@@ -6,6 +6,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "setuid.h"
int main(int argc, char *argv[]) {
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 07/19] whatmask: Fix build with GCC 14
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (4 preceding siblings ...)
2024-08-19 10:05 ` [PATCH 06/19] misc-progs: Fix compilation with GCC 14 Michael Tremer
@ 2024-08-19 10:05 ` Michael Tremer
2024-08-19 10:05 ` [PATCH 08/19] ntp: " Michael Tremer
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 578 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/whatmask | 1 +
1 file changed, 1 insertion(+)
diff --git a/lfs/whatmask b/lfs/whatmask
index 4ac05dfb3..fc572edcd 100644
--- a/lfs/whatmask
+++ b/lfs/whatmask
@@ -73,6 +73,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 08/19] ntp: Fix build with GCC 14
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (5 preceding siblings ...)
2024-08-19 10:05 ` [PATCH 07/19] whatmask: Fix build " Michael Tremer
@ 2024-08-19 10:05 ` Michael Tremer
2024-08-19 10:05 ` [PATCH 09/19] setup: Fix compilation issues " Michael Tremer
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 20755 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/ntp | 2 +
.../ntp-4.2.8_p15-configure-clang16.patch | 610 ++++++++++++++++++
2 files changed, 612 insertions(+)
create mode 100644 src/patches/ntp-4.2.8_p15-configure-clang16.patch
diff --git a/lfs/ntp b/lfs/ntp
index 2d746c78f..9f45d5564 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -71,6 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ntp-4.2.8_p15-configure-clang16.patch
+ cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
diff --git a/src/patches/ntp-4.2.8_p15-configure-clang16.patch b/src/patches/ntp-4.2.8_p15-configure-clang16.patch
new file mode 100644
index 000000000..4b52248bd
--- /dev/null
+++ b/src/patches/ntp-4.2.8_p15-configure-clang16.patch
@@ -0,0 +1,610 @@
+Sync with OpenLDAP. Uses Arsen's patch from https://bugs.gentoo.org/871288.
+
+https://bugs.gentoo.org/871372
+--- a/sntp/m4/openldap-thread-check.m4
++++ b/sntp/m4/openldap-thread-check.m4
+@@ -262,10 +262,8 @@ pthread_rwlock_t rwlock;
+ dnl save the flags
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <pthread.h>
+-#ifndef NULL
+-#define NULL (void*)0
+-#endif
+-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
++pthread_t thread;
++]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
+ ])
+
+ if test $ol_cv_func_pthread_detach = no ; then
+--- a/sntp/m4/openldap.m4
++++ b/sntp/m4/openldap.m4
+@@ -1,16 +1,16 @@
+ dnl OpenLDAP Autoconf Macros
+-dnl $OpenLDAP: pkg/ldap/build/openldap.m4,v 1.157.2.10 2010/04/13 20:22:21 kurt Exp $
++dnl $OpenLDAP$
+ dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ dnl
+-dnl Copyright 1998-2010 The OpenLDAP Foundation.
++dnl Copyright 1998-2022 The OpenLDAP Foundation.
+ dnl All rights reserved.
+ dnl
+ dnl Redistribution and use in source and binary forms, with or without
+ dnl modification, are permitted only as authorized by the OpenLDAP
+ dnl Public License.
+ dnl
+-dnl A copy of this license is available in the file LICENSE-OPENLDAP in
+-dnl this directory of the distribution or, alternatively, at
++dnl A copy of this license is available in the file LICENSE in the
++dnl top-level directory of the distribution or, alternatively, at
+ dnl <http://www.OpenLDAP.org/license.html>.
+ dnl
+ dnl --------------------------------------------------------------------
+@@ -154,6 +154,7 @@ fi
+ if test $ol_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <ctype.h>
++#include <stdlib.h>
+ #ifndef HAVE_EBCDIC
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -170,7 +171,7 @@ exit (0); }
+ ]])],[],[ol_cv_header_stdc=no],[:])
+ fi])
+ if test $ol_cv_header_stdc = yes; then
+- AC_DEFINE([STDC_HEADERS], [1], [is standard C provided?])
++ AC_DEFINE(STDC_HEADERS)
+ fi
+ ac_cv_header_stdc=disable
+ ])
+@@ -242,313 +243,40 @@ AC_DEFUN([OL_RESOLVER_LINK],
+ OL_RESOLVER_TRY(ol_cv_resolver_none)
+ OL_RESOLVER_TRY(ol_cv_resolver_resolv,[-lresolv])
+ OL_RESOLVER_TRY(ol_cv_resolver_bind,[-lbind])
+-])
+-dnl
+-dnl ====================================================================
+-dnl International Components for Unicode (ICU)
+-AC_DEFUN([OL_ICU],
+-[ol_icu=no
+-AC_CHECK_HEADERS( unicode/utypes.h )
+-if test $ac_cv_header_unicode_utypes_h = yes ; then
+- dnl OL_ICULIBS="-licui18n -licuuc -licudata"
+- OL_ICULIBS="-licuuc -licudata"
+-
+- AC_CACHE_CHECK([for ICU libraries], [ol_cv_lib_icu], [
+- ol_LIBS="$LIBS"
+- LIBS="$OL_ICULIBS $LIBS"
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+-#include <unicode/utypes.h>
+-]], [[
+-(void) u_errorName(0);
+-]])],[ol_cv_lib_icu=yes],[ol_cv_lib_icu=no])
+- LIBS="$ol_LIBS"
+-])
+-
+- if test $ol_cv_lib_icu != no ; then
+- ol_icu="$OL_ICULIBS"
+- AC_DEFINE([HAVE_ICU], [1], [define if you actually have ICU])
+- fi
+-fi
+-])
+-dnl
+-dnl ====================================================================
+-dnl Berkeley DB macros
+-dnl
+-dnl --------------------------------------------------------------------
+-dnl Try to link
+-AC_DEFUN([OL_BERKELEY_DB_TRY],
+-[if test $ol_cv_lib_db = no ; then
+- AC_CACHE_CHECK([for Berkeley DB link (]ifelse($2,,default,$2)[)],[$1],
+-[
+- ol_DB_LIB=ifelse($2,,,$2)
+- ol_LIBS=$LIBS
+- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
+-
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+-#ifdef HAVE_DB_185_H
+-# include <db_185.h>
+-#else
+-# include <db.h>
+-#endif
+-
+-#ifndef DB_VERSION_MAJOR
+-# define DB_VERSION_MAJOR 1
+-#endif
+-
+-#ifndef NULL
+-#define NULL ((void*)0)
+-#endif
+-]], [[
+-#if DB_VERSION_MAJOR > 2
+- db_env_create( NULL, 0 );
+-#elif DB_VERSION_MAJOR > 1
+- db_appexit( NULL );
+-#else
+- (void) dbopen( NULL, 0, 0, 0, NULL);
+-#endif
+-]])],[$1=yes],[$1=no])
+-
+- LIBS="$ol_LIBS"
+-])
+-
+- if test $$1 = yes ; then
+- ol_cv_lib_db=ifelse($2,,yes,$2)
+- fi
+-fi
+-])
+-dnl
+-dnl --------------------------------------------------------------------
+-dnl Get major and minor version from <db.h>
+-AC_DEFUN([OL_BDB_HEADER_VERSION],
+-[AC_CACHE_CHECK([for Berkeley DB major version in db.h], [ol_cv_bdb_major],[
+- AC_LANG_CONFTEST([
+-#include <db.h>
+-#ifndef DB_VERSION_MAJOR
+-# define DB_VERSION_MAJOR 1
+-#endif
+-__db_version DB_VERSION_MAJOR
+-])
+- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+- ol_cv_bdb_major=${3}
+-])
+-case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
+- AC_MSG_ERROR([Unknown Berkeley DB major version in db.h]) ;;
+-esac
+-
+-dnl Determine minor version
+-AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
+- AC_LANG_CONFTEST([
+-#include <db.h>
+-#ifndef DB_VERSION_MINOR
+-# define DB_VERSION_MINOR 0
+-#endif
+-__db_version DB_VERSION_MINOR
+-])
+- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+- ol_cv_bdb_minor=${3}
+-])
+-case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
+- AC_MSG_ERROR([Unknown Berkeley DB minor version in db.h]) ;;
+-esac
+-])
+-dnl
+-dnl --------------------------------------------------------------------
+-dnl Try to locate appropriate library
+-AC_DEFUN([OL_BERKELEY_DB_LINK],
+-[ol_cv_lib_db=no
+-
+-if test $ol_cv_bdb_major = 4 ; then
+- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_m,[-ldb-4.$ol_cv_bdb_minor])
+- OL_BERKELEY_DB_TRY(ol_cv_db_db4m,[-ldb4$ol_cv_bdb_minor])
+- OL_BERKELEY_DB_TRY(ol_cv_db_db_4m,[-ldb-4$ol_cv_bdb_minor])
+- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_m,[-ldb-4-$ol_cv_bdb_minor])
+- OL_BERKELEY_DB_TRY(ol_cv_db_db_4,[-ldb-4])
+- OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4])
+- OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb])
+-fi
+-OL_BERKELEY_DB_TRY(ol_cv_db_none)
+-])
+-dnl
+-dnl --------------------------------------------------------------------
+-dnl Check if Berkeley DB version
+-AC_DEFUN([OL_BERKELEY_DB_VERSION],
+-[AC_CACHE_CHECK([for Berkeley DB library and header version match], [ol_cv_berkeley_db_version], [
+- ol_LIBS="$LIBS"
+- LIBS="$LTHREAD_LIBS $LIBS"
+- if test $ol_cv_lib_db != yes ; then
+- LIBS="$ol_cv_lib_db $LIBS"
+- fi
+-
+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-#ifdef HAVE_DB_185_H
+- choke me;
+-#else
+-#include <db.h>
+-#endif
+-#ifndef DB_VERSION_MAJOR
+-# define DB_VERSION_MAJOR 1
+-#endif
+-#ifndef NULL
+-#define NULL ((void *)0)
+-#endif
+-main()
+-{
+-#if DB_VERSION_MAJOR > 1
+- char *version;
+- int major, minor, patch;
+-
+- version = db_version( &major, &minor, &patch );
+-
+- if( major != DB_VERSION_MAJOR ||
+- minor != DB_VERSION_MINOR ||
+- patch != DB_VERSION_PATCH )
+- {
+- printf("Berkeley DB version mismatch\n"
+- "\theader: %s\n\tlibrary: %s\n",
+- DB_VERSION_STRING, version);
+- return 1;
+- }
+-#endif
+-
+- return 0;
+-}]])],[ol_cv_berkeley_db_version=yes],[ol_cv_berkeley_db_version=no],[ol_cv_berkeley_db_version=cross])
+-
+- LIBS="$ol_LIBS"
+ ])
+
+- if test $ol_cv_berkeley_db_version = no ; then
+- AC_MSG_ERROR([Berkeley DB version mismatch])
+- fi
+-])dnl
+-dnl
+ dnl --------------------------------------------------------------------
+-dnl Check if Berkeley DB supports DB_THREAD
+-AC_DEFUN([OL_BERKELEY_DB_THREAD],
+-[AC_CACHE_CHECK([for Berkeley DB thread support], [ol_cv_berkeley_db_thread], [
+- ol_LIBS="$LIBS"
+- LIBS="$LTHREAD_LIBS $LIBS"
+- if test $ol_cv_lib_db != yes ; then
+- LIBS="$ol_cv_lib_db $LIBS"
+- fi
+-
+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-#ifdef HAVE_DB_185_H
+- choke me;
+-#else
+-#include <db.h>
+-#endif
+-#ifndef NULL
+-#define NULL ((void *)0)
+-#endif
+-main()
+-{
+- int rc;
+- u_int32_t flags = DB_CREATE |
+-#ifdef DB_PRIVATE
+- DB_PRIVATE |
+-#endif
+- DB_THREAD;
+-
+-#if DB_VERSION_MAJOR > 2
+- DB_ENV *env = NULL;
+-
+- rc = db_env_create( &env, 0 );
++dnl Check for version compatility with back-mdb
++AC_DEFUN([OL_MDB_COMPAT],
++[AC_CACHE_CHECK([if LMDB version supported by MDB backends], [ol_cv_mdb_compat],[
++ AC_EGREP_CPP(__mdb_version_compat,[
++#include <lmdb.h>
+
+- flags |= DB_INIT_MPOOL;
+-#ifdef DB_MPOOL_PRIVATE
+- flags |= DB_MPOOL_PRIVATE;
++/* require 0.9.18 or later */
++#if MDB_VERSION_FULL >= 0x000000090012
++ __mdb_version_compat
+ #endif
+-
+- if( rc ) {
+- printf("BerkeleyDB: %s\n", db_strerror(rc) );
+- return rc;
+- }
+-
+-#if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1)
+- rc = (env->open)( env, NULL, flags, 0 );
+-#else
+- rc = (env->open)( env, NULL, NULL, flags, 0 );
+-#endif
+-
+- if ( rc == 0 ) {
+- rc = env->close( env, 0 );
+- }
+-
+- if( rc ) {
+- printf("BerkeleyDB: %s\n", db_strerror(rc) );
+- return rc;
+- }
+-
+-#else
+- DB_ENV env;
+- memset( &env, '\0', sizeof(env) );
+-
+- rc = db_appinit( NULL, NULL, &env, flags );
+-
+- if( rc == 0 ) {
+- db_appexit( &env );
+- }
+-
+- unlink("__db_mpool.share");
+- unlink("__db_lock.share");
+-#endif
+-
+- return rc;
+-}]])],[ol_cv_berkeley_db_thread=yes],[ol_cv_berkeley_db_thread=no],[ol_cv_berkeley_db_thread=cross])
+-
+- LIBS="$ol_LIBS"
++ ], [ol_cv_mdb_compat=yes], [ol_cv_mdb_compat=no])])
+ ])
+
+- if test $ol_cv_berkeley_db_thread != no ; then
+- AC_DEFINE([HAVE_BERKELEY_DB_THREAD], [1],
+- [define if Berkeley DB has DB_THREAD support])
+- fi
+-])dnl
+ dnl
+ dnl --------------------------------------------------------------------
+-dnl Find any DB
+-AC_DEFUN([OL_BERKELEY_DB],
+-[ol_cv_berkeley_db=no
+-AC_CHECK_HEADERS(db.h)
+-if test $ac_cv_header_db_h = yes; then
+- OL_BDB_HEADER_VERSION
+- OL_BDB_COMPAT
+-
+- if test $ol_cv_bdb_compat != yes ; then
+- AC_MSG_ERROR([BerkeleyDB version incompatible with BDB/HDB backends])
++dnl Find any MDB
++AC_DEFUN([OL_MDB],
++[ol_cv_mdb=no
++AC_CHECK_HEADERS(lmdb.h)
++if test $ac_cv_header_lmdb_h = yes; then
++ OL_MDB_COMPAT
++
++ if test $ol_cv_mdb_compat != yes ; then
++ AC_MSG_ERROR([LMDB version incompatible with MDB backends])
+ fi
+
+- OL_BERKELEY_DB_LINK
+- if test "$ol_cv_lib_db" != no ; then
+- ol_cv_berkeley_db=yes
+- OL_BERKELEY_DB_VERSION
+- OL_BERKELEY_DB_THREAD
+- fi
++ ol_cv_lib_mdb=-llmdb
++ ol_cv_mdb=yes
+ fi
+ ])
+-dnl --------------------------------------------------------------------
+-dnl Check for version compatility with back-bdb
+-AC_DEFUN([OL_BDB_COMPAT],
+-[AC_CACHE_CHECK([if Berkeley DB version supported by BDB/HDB backends], [ol_cv_bdb_compat],[
+- AC_EGREP_CPP(__db_version_compat,[
+-#include <db.h>
+-
+- /* this check could be improved */
+-#ifndef DB_VERSION_MAJOR
+-# define DB_VERSION_MAJOR 1
+-#endif
+-#ifndef DB_VERSION_MINOR
+-# define DB_VERSION_MINOR 0
+-#endif
+-
+-#define DB_VERSION_MM ((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR)
+
+-/* require 4.4 or later */
+-#if DB_VERSION_MM >= 0x0404
+- __db_version_compat
+-#endif
+- ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
+-])
+
+ dnl
+ dnl ====================================================================
+@@ -664,12 +392,10 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
+ return 0;
+ ]])
+
+-AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], [
+-AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
++AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
++[AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
+
+-int main(argc, argv)
+- int argc;
+- char **argv;
++int main(int argc, char **argv)
+ {
+ OL_PTHREAD_TEST_FUNCTION
+ }
+@@ -706,7 +432,7 @@ dnl Check GNU Pth pthread Header
+ dnl
+ dnl defines ol_cv_header linux_threads to 'yes' or 'no'
+ dnl 'no' implies pthreads.h is not LinuxThreads or pthreads.h
+-dnl doesn't exists. Existance of pthread.h should separately
++dnl doesn't exist. Existence of pthread.h should separately
+ dnl checked.
+ dnl
+ AC_DEFUN([OL_HEADER_GNU_PTH_PTHREAD_H], [
+@@ -728,7 +454,7 @@ AC_DEFUN([OL_NT_THREADS], [
+ AC_CHECK_FUNC(_beginthread)
+
+ if test $ac_cv_func__beginthread = yes ; then
+- AC_DEFINE([HAVE_NT_THREADS], [1], [if you have NT Threads])
++ AC_DEFINE(HAVE_NT_THREADS,1,[if you have NT Threads])
+ ol_cv_nt_threads=yes
+ fi
+ ])
+@@ -737,7 +463,7 @@ dnl Check LinuxThreads Header
+ dnl
+ dnl defines ol_cv_header linux_threads to 'yes' or 'no'
+ dnl 'no' implies pthreads.h is not LinuxThreads or pthreads.h
+-dnl doesn't exists. Existance of pthread.h should separately
++dnl doesn't exist. Existence of pthread.h should separately
+ dnl checked.
+ dnl
+ AC_DEFUN([OL_HEADER_LINUX_THREADS], [
+@@ -749,7 +475,7 @@ AC_DEFUN([OL_HEADER_LINUX_THREADS], [
+ [ol_cv_header_linux_threads=no])
+ ])
+ if test $ol_cv_header_linux_threads = yes; then
+- AC_DEFINE([HAVE_LINUX_THREADS], [1], [if you have LinuxThreads])
++ AC_DEFINE(HAVE_LINUX_THREADS,1,[if you have LinuxThreads])
+ fi
+ ])dnl
+ dnl --------------------------------------------------------------------
+@@ -791,7 +517,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[
+ #include <sys/types.h>
+ #include <regex.h>
+ static char *pattern, *string;
+-main()
++int main(void)
+ {
+ int rc;
+ regex_t re;
+@@ -818,7 +544,8 @@ AC_DEFUN([OL_C_UPPER_LOWER],
+ [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <ctype.h>
+-main()
++#include <stdlib.h>
++int main(void)
+ {
+ if ('C' == toupper('C'))
+ exit(0);
+@@ -826,7 +553,7 @@ main()
+ exit(1);
+ }]])],[ol_cv_c_upper_lower=no],[ol_cv_c_upper_lower=yes],[ol_cv_c_upper_lower=safe])])
+ if test $ol_cv_c_upper_lower != no ; then
+- AC_DEFINE([C_UPPER_LOWER], [1], [define if toupper() requires islower()])
++ AC_DEFINE(C_UPPER_LOWER,1, [define if toupper() requires islower()])
+ fi
+ ])
+ dnl
+@@ -837,29 +564,32 @@ dnl Check for declaration of sys_errlist in one of stdio.h and errno.h.
+ dnl Declaration of sys_errlist on BSD4.4 interferes with our declaration.
+ dnl Reported by Keith Bostic.
+ AC_DEFUN([OL_SYS_ERRLIST],
+-[AC_CACHE_CHECK([declaration of sys_errlist],ol_cv_dcl_sys_errlist,[
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++[AC_CACHE_CHECK([existence of sys_errlist],ol_cv_have_sys_errlist,[
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <errno.h>]], [[char *c = (char *) *sys_errlist]])],[ol_cv_have_sys_errlist=yes],[ol_cv_have_sys_errlist=no])])
++if test $ol_cv_have_sys_errlist = yes ; then
++ AC_DEFINE(HAVE_SYS_ERRLIST,1,
++ [define if you actually have sys_errlist in your libs])
++ AC_CACHE_CHECK([declaration of sys_errlist],ol_cv_dcl_sys_errlist,[
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <errno.h>
+ #ifdef _WIN32
+ #include <stdlib.h>
+-#endif ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_dcl_sys_errlist=yes
+- ol_cv_have_sys_errlist=yes],[ol_cv_dcl_sys_errlist=no])])
++#endif ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_dcl_sys_errlist=yes],
++ [ol_cv_dcl_sys_errlist=no])])
+ #
+-# It's possible (for near-UNIX clones) that sys_errlist doesn't exist
+-if test $ol_cv_dcl_sys_errlist = no ; then
+- AC_DEFINE([DECL_SYS_ERRLIST], [1],
+- [define if sys_errlist is not declared in stdio.h or errno.h])
+-
+- AC_CACHE_CHECK([existence of sys_errlist],ol_cv_have_sys_errlist,[
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <errno.h>]], [[char *c = (char *) *sys_errlist]])],[ol_cv_have_sys_errlist=yes],[ol_cv_have_sys_errlist=no])])
+-fi
+-if test $ol_cv_have_sys_errlist = yes ; then
+- AC_DEFINE([HAVE_SYS_ERRLIST], [1],
+- [define if you actually have sys_errlist in your libs])
++ # It's possible (for near-UNIX clones) that sys_errlist doesn't exist
++ if test $ol_cv_dcl_sys_errlist = no ; then
++ AC_DEFINE(DECL_SYS_ERRLIST,1,
++ [define if sys_errlist is not declared in stdio.h or errno.h])
++ fi
+ fi
+ ])dnl
++dnl
++dnl ====================================================================
++dnl glibc supplies a non-standard strerror_r if _GNU_SOURCE is defined.
++dnl It's actually preferable to the POSIX version, if available.
+ AC_DEFUN([OL_NONPOSIX_STRERROR_R],
+ [AC_CACHE_CHECK([non-posix strerror_r],ol_cv_nonposix_strerror_r,[
+ AC_EGREP_CPP(strerror_r,[#include <string.h>],
+@@ -873,24 +603,23 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R],
+ ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no])
+ else
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+- main() {
++ int main(void) {
+ char buf[100];
+ buf[0] = 0;
+ strerror_r( 1, buf, sizeof buf );
+ exit( buf[0] == 0 );
+ }
+- ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror=no],[ol_cv_nonposix_strerror=no])
++ ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no],[ol_cv_nonposix_strerror_r=no])
+ fi
+ ])
+ if test $ol_cv_nonposix_strerror_r = yes ; then
+- AC_DEFINE([HAVE_NONPOSIX_STRERROR_R], [1],
++ AC_DEFINE(HAVE_NONPOSIX_STRERROR_R,1,
+ [define if strerror_r returns char* instead of int])
+ fi
+ ])dnl
+ dnl
+ AC_DEFUN([OL_STRERROR],
+-[OL_SYS_ERRLIST dnl TEMPORARY
+-AC_CHECK_FUNCS(strerror strerror_r)
++[AC_CHECK_FUNCS(strerror strerror_r)
+ ol_cv_func_strerror_r=no
+ if test "${ac_cv_func_strerror_r}" = yes ; then
+ OL_NONPOSIX_STRERROR_R
+@@ -910,7 +639,7 @@ AC_DEFUN([OL_C_VOLATILE],
+ if test $ol_cv_c_volatile = yes; then
+ :
+ else
+- AC_DEFINE([volatile], [], [define as empty if volatile is not supported])
++ AC_DEFINE(volatile,,[define as empty if volatile is not supported])
+ fi
+ ])dnl
+ dnl
+@@ -918,7 +647,7 @@ dnl ====================================================================
+ dnl Look for fetch(3)
+ AC_DEFUN([OL_LIB_FETCH],
+ [ol_LIBS=$LIBS
+-LIBS="-lfetch -lcom_err $LIBS"
++LIBS="-lfetch $LIBS"
+ AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef HAVE_SYS_PARAM_H
+@@ -928,8 +657,8 @@ AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[
+ #include <fetch.h>]], [[struct url *u = fetchParseURL("file:///"); ]])],[ol_cv_lib_fetch=yes],[ol_cv_lib_fetch=no])])
+ LIBS=$ol_LIBS
+ if test $ol_cv_lib_fetch != no ; then
+- ol_link_fetch="-lfetch -lcom_err"
+- AC_DEFINE([HAVE_FETCH], [1],
++ ol_link_fetch="-lfetch"
++ AC_DEFINE(HAVE_FETCH,1,
+ [define if you actually have FreeBSD fetch(3)])
+ fi
+ ])dnl
+@@ -1094,7 +823,7 @@ AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS],
+ ])dnl
+ dnl
+ dnl --------------------------------------------------------------------
+-dnl Check for Cyrus SASL version compatility
++dnl Check for Cyrus SASL version compatibility
+ AC_DEFUN([OL_SASL_COMPAT],
+ [AC_CACHE_CHECK([Cyrus SASL library version], [ol_cv_sasl_compat],[
+ AC_EGREP_CPP(__sasl_compat,[
+@@ -1113,19 +842,3 @@ AC_DEFUN([OL_SASL_COMPAT],
+ #endif
+ ], [ol_cv_sasl_compat=yes], [ol_cv_sasl_compat=no])])
+ ])
+-dnl ====================================================================
+-dnl check for SSL compatibility
+-AC_DEFUN([OL_SSL_COMPAT],
+-[AC_CACHE_CHECK([OpenSSL library version (CRL checking capability)],
+- [ol_cv_ssl_crl_compat],[
+- AC_EGREP_CPP(__ssl_compat,[
+-#ifdef HAVE_OPENSSL_SSL_H
+-#include <openssl/ssl.h>
+-#endif
+-
+-/* Require 0.9.7d+ */
+-#if OPENSSL_VERSION_NUMBER >= 0x0090704fL
+- char *__ssl_compat = "0.9.7d";
+-#endif
+- ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
+-])
+--
+2.38.1
+
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 09/19] setup: Fix compilation issues with GCC 14
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (6 preceding siblings ...)
2024-08-19 10:05 ` [PATCH 08/19] ntp: " Michael Tremer
@ 2024-08-19 10:05 ` Michael Tremer
2024-08-19 10:05 ` [PATCH 10/19] autoconf-archive: New package Michael Tremer
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4499 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
src/setup/dhcp.c | 2 +-
src/setup/main.c | 1 -
src/setup/misc.c | 1 -
src/setup/netstuff.c | 19 +++++++++----------
src/setup/networking.c | 9 ++-------
5 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/setup/dhcp.c b/src/setup/dhcp.c
index 22f471851..48381f72f 100644
--- a/src/setup/dhcp.c
+++ b/src/setup/dhcp.c
@@ -38,7 +38,7 @@ void dhcpdialogcallbackdhcp(newtComponent cm, void *data);
int handledhcp(void)
{
- char *results[MAX_BOXES];
+ const char *results[MAX_BOXES];
char enabledresult;
char startenabled;
struct newtExitStruct es;
diff --git a/src/setup/main.c b/src/setup/main.c
index adb98a231..c51c6e8fe 100644
--- a/src/setup/main.c
+++ b/src/setup/main.c
@@ -30,7 +30,6 @@ int main(int argc, char *argv[])
struct keyvalue *kv;
char lang[STRING_SIZE] = "en_US.utf8";
char title[STRING_SIZE];
- int langcounter;
int autook = 0;
/* Log file/terminal stuff. */
diff --git a/src/setup/misc.c b/src/setup/misc.c
index f9ba39b8c..6c1033598 100644
--- a/src/setup/misc.c
+++ b/src/setup/misc.c
@@ -21,7 +21,6 @@ extern int automode;
int writehostsfiles(void)
{
- char message[1000];
struct keyvalue *kv;
char hostname[STRING_SIZE];
char domainname[STRING_SIZE] = "localdomain";
diff --git a/src/setup/netstuff.c b/src/setup/netstuff.c
index 1e196dc1e..60e27242f 100644
--- a/src/setup/netstuff.c
+++ b/src/setup/netstuff.c
@@ -52,11 +52,11 @@ static int ip_input_filter(newtComponent entry, void * data, int ch, int cursor)
int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
char *defaultdhcphostname)
{
- char *addressresult;
- char *netmaskresult;
- char *gatewayresult;
- char *dhcphostnameresult;
- char *dhcpforcemturesult;
+ const char *addressresult;
+ const char *netmaskresult;
+ const char *gatewayresult;
+ const char *dhcphostnameresult;
+ const char *dhcpforcemturesult;
struct newtExitStruct es;
newtComponent header;
newtComponent addresslabel;
@@ -480,14 +480,14 @@ char* readmac(char *card) {
char* find_nic4mac(char *findmac) {
DIR *dir;
struct dirent *dirzeiger;
- char temp[STRING_SIZE], temp2[STRING_SIZE];
+ char temp[STRING_SIZE] = "";
+ char temp2[STRING_SIZE] = "";
if((dir=opendir(SYSDIR)) == NULL) {
fprintf(flog,"Fehler bei opendir (find_name4nic) ...\n");
return NULL;
}
- sprintf(temp, "");
while((dirzeiger=readdir(dir)) != NULL) {
if(*((*dirzeiger).d_name) != '.' & strcmp(((*dirzeiger).d_name), "lo") != 0) {
sprintf(temp2, "%s", readmac((*dirzeiger).d_name) );
@@ -550,7 +550,6 @@ int rename_nics(void) {
int write_configs_netudev(int card , int colour)
{
- char commandstring[STRING_SIZE];
struct keyvalue *kv = initkeyvalues();
char temp1[STRING_SIZE], temp2[STRING_SIZE], temp3[STRING_SIZE];
char ucolour[STRING_SIZE];
@@ -586,7 +585,7 @@ int write_configs_netudev(int card , int colour)
int scan_network_cards(void)
{
FILE *fp;
- char driver[STRING_SIZE], description[STRING_SIZE], macaddr[STRING_SIZE], temp_line[STRING_SIZE];
+ char temp_line[STRING_SIZE];
int count = 0;
const char _driver[]="driver: ";
const char _desc[]="desc: ";
@@ -732,7 +731,7 @@ int ask_clear_card_entry(int card)
sprintf(message, _("Do you really want to remove the assigned %s interface?"), ucolourcard[card]);
rc = newtWinChoice(_("Warning"), _("OK"), _("Cancel"), message);
- if ( rc = 0 || rc == 1) {
+ if ( rc == 0 || rc == 1) {
clear_card_entry(card);
} else return 1;
diff --git a/src/setup/networking.c b/src/setup/networking.c
index 9dd5205e5..8d398f365 100644
--- a/src/setup/networking.c
+++ b/src/setup/networking.c
@@ -385,7 +385,7 @@ int drivermenu(void)
if (strcmp(knics[i].macaddr, ""))
kcount++;
- if (neednics = kcount)
+ if (neednics == kcount)
{
strcat(message, "\n");
strcat(message, _("Do you wish to change these settings?"));
@@ -403,11 +403,6 @@ int drivermenu(void)
return 1;
}
-int set_menu_entry_for(int *nr, int *card)
-{
-
-}
-
int changedrivers(void)
{
struct keyvalue *kv = initkeyvalues();
@@ -438,7 +433,7 @@ int changedrivers(void)
{ green = 1; red = 1; blue = 1; }
else if (configtype == 4)
{ green = 1; red=1; orange=1; blue = 1; }
- else if (configtype == "")
+ else
{ green = 1; red = 1; }
do
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 10/19] autoconf-archive: New package
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (7 preceding siblings ...)
2024-08-19 10:05 ` [PATCH 09/19] setup: Fix compilation issues " Michael Tremer
@ 2024-08-19 10:05 ` Michael Tremer
2024-08-19 10:06 ` [PATCH 11/19] berkeley: Fix build with GCC 14 Michael Tremer
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 30183 bytes --]
These macros are needed to run autoreconf for db-5.3.28.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/autoconf-archive | 592 +++++++++++++++++++++++
lfs/autoconf-archive | 77 +++
make.sh | 1 +
3 files changed, 670 insertions(+)
create mode 100644 config/rootfiles/common/autoconf-archive
create mode 100644 lfs/autoconf-archive
diff --git a/config/rootfiles/common/autoconf-archive b/config/rootfiles/common/autoconf-archive
new file mode 100644
index 000000000..baccd24be
--- /dev/null
+++ b/config/rootfiles/common/autoconf-archive
@@ -0,0 +1,592 @@
+#usr/share/aclocal/ax_absolute_header.m4
+#usr/share/aclocal/ax_ac_append_to_file.m4
+#usr/share/aclocal/ax_ac_print_to_file.m4
+#usr/share/aclocal/ax_add_am_macro.m4
+#usr/share/aclocal/ax_add_am_macro_static.m4
+#usr/share/aclocal/ax_add_am_trilinos_makefile_export.m4
+#usr/share/aclocal/ax_add_fortify_source.m4
+#usr/share/aclocal/ax_add_recursive_am_macro.m4
+#usr/share/aclocal/ax_add_recursive_am_macro_static.m4
+#usr/share/aclocal/ax_afs.m4
+#usr/share/aclocal/ax_am_jobserver.m4
+#usr/share/aclocal/ax_am_macros.m4
+#usr/share/aclocal/ax_am_macros_static.m4
+#usr/share/aclocal/ax_am_override_var.m4
+#usr/share/aclocal/ax_append_compile_flags.m4
+#usr/share/aclocal/ax_append_flag.m4
+#usr/share/aclocal/ax_append_link_flags.m4
+#usr/share/aclocal/ax_append_to_file.m4
+#usr/share/aclocal/ax_arg_with_path_style.m4
+#usr/share/aclocal/ax_asm_inline.m4
+#usr/share/aclocal/ax_at_check_pattern.m4
+#usr/share/aclocal/ax_auto_include_headers.m4
+#usr/share/aclocal/ax_berkeley_db.m4
+#usr/share/aclocal/ax_berkeley_db_cxx.m4
+#usr/share/aclocal/ax_blas.m4
+#usr/share/aclocal/ax_blas_f77_func.m4
+#usr/share/aclocal/ax_boost_asio.m4
+#usr/share/aclocal/ax_boost_atomic.m4
+#usr/share/aclocal/ax_boost_base.m4
+#usr/share/aclocal/ax_boost_chrono.m4
+#usr/share/aclocal/ax_boost_context.m4
+#usr/share/aclocal/ax_boost_coroutine.m4
+#usr/share/aclocal/ax_boost_date_time.m4
+#usr/share/aclocal/ax_boost_filesystem.m4
+#usr/share/aclocal/ax_boost_iostreams.m4
+#usr/share/aclocal/ax_boost_json.m4
+#usr/share/aclocal/ax_boost_locale.m4
+#usr/share/aclocal/ax_boost_log.m4
+#usr/share/aclocal/ax_boost_log_setup.m4
+#usr/share/aclocal/ax_boost_process.m4
+#usr/share/aclocal/ax_boost_program_options.m4
+#usr/share/aclocal/ax_boost_python.m4
+#usr/share/aclocal/ax_boost_random.m4
+#usr/share/aclocal/ax_boost_regex.m4
+#usr/share/aclocal/ax_boost_serialization.m4
+#usr/share/aclocal/ax_boost_signals.m4
+#usr/share/aclocal/ax_boost_system.m4
+#usr/share/aclocal/ax_boost_test_exec_monitor.m4
+#usr/share/aclocal/ax_boost_thread.m4
+#usr/share/aclocal/ax_boost_unit_test_framework.m4
+#usr/share/aclocal/ax_boost_wave.m4
+#usr/share/aclocal/ax_boost_wserialization.m4
+#usr/share/aclocal/ax_build_date_epoch.m4
+#usr/share/aclocal/ax_c99_inline.m4
+#usr/share/aclocal/ax_c___attribute__.m4
+#usr/share/aclocal/ax_c_arithmetic_rshift.m4
+#usr/share/aclocal/ax_c_compile_value.m4
+#usr/share/aclocal/ax_c_declare_block.m4
+#usr/share/aclocal/ax_c_float_words_bigendian.m4
+#usr/share/aclocal/ax_c_long_long.m4
+#usr/share/aclocal/ax_c_referenceable_passed_va_list.m4
+#usr/share/aclocal/ax_c_restrict.m4
+#usr/share/aclocal/ax_c_var_func.m4
+#usr/share/aclocal/ax_cache_size.m4
+#usr/share/aclocal/ax_caolan_check_package.m4
+#usr/share/aclocal/ax_caolan_search_package.m4
+#usr/share/aclocal/ax_cc_for_build.m4
+#usr/share/aclocal/ax_cc_maxopt.m4
+#usr/share/aclocal/ax_cf_ebcdic.m4
+#usr/share/aclocal/ax_cflags_aix_option.m4
+#usr/share/aclocal/ax_cflags_force_c89.m4
+#usr/share/aclocal/ax_cflags_hpux_option.m4
+#usr/share/aclocal/ax_cflags_irix_option.m4
+#usr/share/aclocal/ax_cflags_no_writable_strings.m4
+#usr/share/aclocal/ax_cflags_strict_prototypes.m4
+#usr/share/aclocal/ax_cflags_sun_option.m4
+#usr/share/aclocal/ax_cflags_warn_all.m4
+#usr/share/aclocal/ax_check_aligned_access_required.m4
+#usr/share/aclocal/ax_check_allocated_ctime.m4
+#usr/share/aclocal/ax_check_awk__v.m4
+#usr/share/aclocal/ax_check_awk__x_escapes.m4
+#usr/share/aclocal/ax_check_awk_and.m4
+#usr/share/aclocal/ax_check_awk_argind.m4
+#usr/share/aclocal/ax_check_awk_array_delete.m4
+#usr/share/aclocal/ax_check_awk_array_delete_elem.m4
+#usr/share/aclocal/ax_check_awk_array_in.m4
+#usr/share/aclocal/ax_check_awk_asort.m4
+#usr/share/aclocal/ax_check_awk_asorti.m4
+#usr/share/aclocal/ax_check_awk_associative_array.m4
+#usr/share/aclocal/ax_check_awk_atan2.m4
+#usr/share/aclocal/ax_check_awk_compl.m4
+#usr/share/aclocal/ax_check_awk_conditional_expression.m4
+#usr/share/aclocal/ax_check_awk_cos.m4
+#usr/share/aclocal/ax_check_awk_environ.m4
+#usr/share/aclocal/ax_check_awk_errno.m4
+#usr/share/aclocal/ax_check_awk_exit.m4
+#usr/share/aclocal/ax_check_awk_exp.m4
+#usr/share/aclocal/ax_check_awk_gensub.m4
+#usr/share/aclocal/ax_check_awk_getline.m4
+#usr/share/aclocal/ax_check_awk_gsub.m4
+#usr/share/aclocal/ax_check_awk_ignorecase.m4
+#usr/share/aclocal/ax_check_awk_index.m4
+#usr/share/aclocal/ax_check_awk_int.m4
+#usr/share/aclocal/ax_check_awk_length.m4
+#usr/share/aclocal/ax_check_awk_log.m4
+#usr/share/aclocal/ax_check_awk_lshift.m4
+#usr/share/aclocal/ax_check_awk_match_2parms.m4
+#usr/share/aclocal/ax_check_awk_match_3parms.m4
+#usr/share/aclocal/ax_check_awk_operator_multiply_multiply.m4
+#usr/share/aclocal/ax_check_awk_operator_square.m4
+#usr/share/aclocal/ax_check_awk_or.m4
+#usr/share/aclocal/ax_check_awk_printf.m4
+#usr/share/aclocal/ax_check_awk_rand.m4
+#usr/share/aclocal/ax_check_awk_rshift.m4
+#usr/share/aclocal/ax_check_awk_sin.m4
+#usr/share/aclocal/ax_check_awk_split.m4
+#usr/share/aclocal/ax_check_awk_sprintf.m4
+#usr/share/aclocal/ax_check_awk_sqrt.m4
+#usr/share/aclocal/ax_check_awk_srand.m4
+#usr/share/aclocal/ax_check_awk_strftime.m4
+#usr/share/aclocal/ax_check_awk_strtonum.m4
+#usr/share/aclocal/ax_check_awk_sub.m4
+#usr/share/aclocal/ax_check_awk_substr.m4
+#usr/share/aclocal/ax_check_awk_system.m4
+#usr/share/aclocal/ax_check_awk_systime.m4
+#usr/share/aclocal/ax_check_awk_tolower.m4
+#usr/share/aclocal/ax_check_awk_toupper.m4
+#usr/share/aclocal/ax_check_awk_user_defined_functions.m4
+#usr/share/aclocal/ax_check_awk_var_regexp.m4
+#usr/share/aclocal/ax_check_awk_variable_value_pairs.m4
+#usr/share/aclocal/ax_check_awk_xor.m4
+#usr/share/aclocal/ax_check_class.m4
+#usr/share/aclocal/ax_check_classpath.m4
+#usr/share/aclocal/ax_check_compile_flag.m4
+#usr/share/aclocal/ax_check_define.m4
+#usr/share/aclocal/ax_check_docbook_dtd.m4
+#usr/share/aclocal/ax_check_docbook_xslt.m4
+#usr/share/aclocal/ax_check_docbook_xslt_min.m4
+#usr/share/aclocal/ax_check_dos_filesys.m4
+#usr/share/aclocal/ax_check_enable_debug.m4
+#usr/share/aclocal/ax_check_func_in.m4
+#usr/share/aclocal/ax_check_gd.m4
+#usr/share/aclocal/ax_check_gir_symbols_gjs.m4
+#usr/share/aclocal/ax_check_girs_gjs.m4
+#usr/share/aclocal/ax_check_gl.m4
+#usr/share/aclocal/ax_check_glu.m4
+#usr/share/aclocal/ax_check_glut.m4
+#usr/share/aclocal/ax_check_glx.m4
+#usr/share/aclocal/ax_check_gnu_make.m4
+#usr/share/aclocal/ax_check_icu.m4
+#usr/share/aclocal/ax_check_java_home.m4
+#usr/share/aclocal/ax_check_java_plugin.m4
+#usr/share/aclocal/ax_check_junit.m4
+#usr/share/aclocal/ax_check_library.m4
+#usr/share/aclocal/ax_check_link_flag.m4
+#usr/share/aclocal/ax_check_mysql.m4
+#usr/share/aclocal/ax_check_mysql_db.m4
+#usr/share/aclocal/ax_check_mysqlr.m4
+#usr/share/aclocal/ax_check_off64_t.m4
+#usr/share/aclocal/ax_check_openssl.m4
+#usr/share/aclocal/ax_check_page_aligned_malloc.m4
+#usr/share/aclocal/ax_check_pathfind.m4
+#usr/share/aclocal/ax_check_pathname_style.m4
+#usr/share/aclocal/ax_check_pcre2.m4
+#usr/share/aclocal/ax_check_pgsql_db.m4
+#usr/share/aclocal/ax_check_posix_regcomp.m4
+#usr/share/aclocal/ax_check_posix_sysinfo.m4
+#usr/share/aclocal/ax_check_postgres_db.m4
+#usr/share/aclocal/ax_check_preproc_flag.m4
+#usr/share/aclocal/ax_check_rqrd_class.m4
+#usr/share/aclocal/ax_check_sign.m4
+#usr/share/aclocal/ax_check_strcspn.m4
+#usr/share/aclocal/ax_check_strftime.m4
+#usr/share/aclocal/ax_check_struct_for.m4
+#usr/share/aclocal/ax_check_symbol.m4
+#usr/share/aclocal/ax_check_sys_siglist.m4
+#usr/share/aclocal/ax_check_typedef.m4
+#usr/share/aclocal/ax_check_uname_syscall.m4
+#usr/share/aclocal/ax_check_user.m4
+#usr/share/aclocal/ax_check_vscript.m4
+#usr/share/aclocal/ax_check_x86_features.m4
+#usr/share/aclocal/ax_check_zlib.m4
+#usr/share/aclocal/ax_code_coverage.m4
+#usr/share/aclocal/ax_compare_version.m4
+#usr/share/aclocal/ax_compile_check_sizeof.m4
+#usr/share/aclocal/ax_compiler_flags.m4
+#usr/share/aclocal/ax_compiler_flags_cflags.m4
+#usr/share/aclocal/ax_compiler_flags_cxxflags.m4
+#usr/share/aclocal/ax_compiler_flags_gir.m4
+#usr/share/aclocal/ax_compiler_flags_ldflags.m4
+#usr/share/aclocal/ax_compiler_vendor.m4
+#usr/share/aclocal/ax_compiler_version.m4
+#usr/share/aclocal/ax_compute_relative_paths.m4
+#usr/share/aclocal/ax_compute_standard_relative_paths.m4
+#usr/share/aclocal/ax_cond_with_level.m4
+#usr/share/aclocal/ax_config_feature.m4
+#usr/share/aclocal/ax_configure_args.m4
+#usr/share/aclocal/ax_count_cpus.m4
+#usr/share/aclocal/ax_cpu_freq.m4
+#usr/share/aclocal/ax_cpu_vendor.m4
+#usr/share/aclocal/ax_create_generic_config.m4
+#usr/share/aclocal/ax_create_pkgconfig_info.m4
+#usr/share/aclocal/ax_create_stdint_h.m4
+#usr/share/aclocal/ax_create_target_h.m4
+#usr/share/aclocal/ax_cvs.m4
+#usr/share/aclocal/ax_cxx_bool.m4
+#usr/share/aclocal/ax_cxx_compile_stdcxx.m4
+#usr/share/aclocal/ax_cxx_compile_stdcxx_0x.m4
+#usr/share/aclocal/ax_cxx_compile_stdcxx_11.m4
+#usr/share/aclocal/ax_cxx_compile_stdcxx_14.m4
+#usr/share/aclocal/ax_cxx_compile_stdcxx_17.m4
+#usr/share/aclocal/ax_cxx_complex_math_in_namespace_std.m4
+#usr/share/aclocal/ax_cxx_const_cast.m4
+#usr/share/aclocal/ax_cxx_cppflags_std_lang.m4
+#usr/share/aclocal/ax_cxx_cxxflags_std_lang.m4
+#usr/share/aclocal/ax_cxx_default_template_parameters.m4
+#usr/share/aclocal/ax_cxx_delete_method.m4
+#usr/share/aclocal/ax_cxx_dtor_after_atexit.m4
+#usr/share/aclocal/ax_cxx_dynamic_cast.m4
+#usr/share/aclocal/ax_cxx_enum_computations.m4
+#usr/share/aclocal/ax_cxx_enum_computations_with_cast.m4
+#usr/share/aclocal/ax_cxx_erase_iterator_type.m4
+#usr/share/aclocal/ax_cxx_exceptions.m4
+#usr/share/aclocal/ax_cxx_explicit.m4
+#usr/share/aclocal/ax_cxx_explicit_instantiations.m4
+#usr/share/aclocal/ax_cxx_explicit_template_function_qualification.m4
+#usr/share/aclocal/ax_cxx_extern_template.m4
+#usr/share/aclocal/ax_cxx_full_specialization_syntax.m4
+#usr/share/aclocal/ax_cxx_function_nontype_parameters.m4
+#usr/share/aclocal/ax_cxx_function_try_blocks.m4
+#usr/share/aclocal/ax_cxx_gcc_abi_demangle.m4
+#usr/share/aclocal/ax_cxx_gnucxx_hashmap.m4
+#usr/share/aclocal/ax_cxx_have_bad_function_call.m4
+#usr/share/aclocal/ax_cxx_have_bind.m4
+#usr/share/aclocal/ax_cxx_have_bit_and.m4
+#usr/share/aclocal/ax_cxx_have_bit_or.m4
+#usr/share/aclocal/ax_cxx_have_bit_xor.m4
+#usr/share/aclocal/ax_cxx_have_complex.m4
+#usr/share/aclocal/ax_cxx_have_complex_math1.m4
+#usr/share/aclocal/ax_cxx_have_complex_math2.m4
+#usr/share/aclocal/ax_cxx_have_cref.m4
+#usr/share/aclocal/ax_cxx_have_empty_iostream.m4
+#usr/share/aclocal/ax_cxx_have_ext_hash_map.m4
+#usr/share/aclocal/ax_cxx_have_ext_hash_set.m4
+#usr/share/aclocal/ax_cxx_have_ext_slist.m4
+#usr/share/aclocal/ax_cxx_have_freeze_sstream.m4
+#usr/share/aclocal/ax_cxx_have_function.m4
+#usr/share/aclocal/ax_cxx_have_hash.m4
+#usr/share/aclocal/ax_cxx_have_ieee_math.m4
+#usr/share/aclocal/ax_cxx_have_is_bind_expression.m4
+#usr/share/aclocal/ax_cxx_have_is_placeholder.m4
+#usr/share/aclocal/ax_cxx_have_koenig_lookup.m4
+#usr/share/aclocal/ax_cxx_have_long_long_for_iostream.m4
+#usr/share/aclocal/ax_cxx_have_mem_fn.m4
+#usr/share/aclocal/ax_cxx_have_numeric_limits.m4
+#usr/share/aclocal/ax_cxx_have_placeholders.m4
+#usr/share/aclocal/ax_cxx_have_ref.m4
+#usr/share/aclocal/ax_cxx_have_reference_wrapper.m4
+#usr/share/aclocal/ax_cxx_have_sstream.m4
+#usr/share/aclocal/ax_cxx_have_std.m4
+#usr/share/aclocal/ax_cxx_have_stl.m4
+#usr/share/aclocal/ax_cxx_have_string_push_back.m4
+#usr/share/aclocal/ax_cxx_have_system_v_math.m4
+#usr/share/aclocal/ax_cxx_have_valarray.m4
+#usr/share/aclocal/ax_cxx_have_vector_at.m4
+#usr/share/aclocal/ax_cxx_header_pre_stdcxx.m4
+#usr/share/aclocal/ax_cxx_header_stdcxx_0x.m4
+#usr/share/aclocal/ax_cxx_header_stdcxx_98.m4
+#usr/share/aclocal/ax_cxx_header_stdcxx_tr1.m4
+#usr/share/aclocal/ax_cxx_header_tr1_unordered_map.m4
+#usr/share/aclocal/ax_cxx_header_tr1_unordered_set.m4
+#usr/share/aclocal/ax_cxx_header_unordered_map.m4
+#usr/share/aclocal/ax_cxx_header_unordered_set.m4
+#usr/share/aclocal/ax_cxx_ldflags_std_lang.m4
+#usr/share/aclocal/ax_cxx_member_constants.m4
+#usr/share/aclocal/ax_cxx_member_templates.m4
+#usr/share/aclocal/ax_cxx_member_templates_outside_class.m4
+#usr/share/aclocal/ax_cxx_mutable.m4
+#usr/share/aclocal/ax_cxx_namespace_std.m4
+#usr/share/aclocal/ax_cxx_namespaces.m4
+#usr/share/aclocal/ax_cxx_new_for_scoping.m4
+#usr/share/aclocal/ax_cxx_old_for_scoping.m4
+#usr/share/aclocal/ax_cxx_partial_ordering.m4
+#usr/share/aclocal/ax_cxx_partial_specialization.m4
+#usr/share/aclocal/ax_cxx_reinterpret_cast.m4
+#usr/share/aclocal/ax_cxx_restrict_this.m4
+#usr/share/aclocal/ax_cxx_rtti.m4
+#usr/share/aclocal/ax_cxx_rvalue_references.m4
+#usr/share/aclocal/ax_cxx_static_cast.m4
+#usr/share/aclocal/ax_cxx_stlport_hashmap.m4
+#usr/share/aclocal/ax_cxx_template_keyword_qualifier.m4
+#usr/share/aclocal/ax_cxx_template_qualified_base_class.m4
+#usr/share/aclocal/ax_cxx_template_qualified_return_type.m4
+#usr/share/aclocal/ax_cxx_template_scoped_argument_matching.m4
+#usr/share/aclocal/ax_cxx_templates.m4
+#usr/share/aclocal/ax_cxx_templates_as_template_arguments.m4
+#usr/share/aclocal/ax_cxx_typename.m4
+#usr/share/aclocal/ax_cxx_use_numtrait.m4
+#usr/share/aclocal/ax_cxx_var_prettyfunc.m4
+#usr/share/aclocal/ax_cxx_verbose_terminate_handler.m4
+#usr/share/aclocal/ax_czmq.m4
+#usr/share/aclocal/ax_decl_wchar_max.m4
+#usr/share/aclocal/ax_define_integer_bits.m4
+#usr/share/aclocal/ax_define_sub_path.m4
+#usr/share/aclocal/ax_dirname.m4
+#usr/share/aclocal/ax_dist_msi.m4
+#usr/share/aclocal/ax_dist_rpm.m4
+#usr/share/aclocal/ax_dll_string.m4
+#usr/share/aclocal/ax_elisp.m4
+#usr/share/aclocal/ax_enable_builddir.m4
+#usr/share/aclocal/ax_execinfo.m4
+#usr/share/aclocal/ax_expand_prefix.m4
+#usr/share/aclocal/ax_ext.m4
+#usr/share/aclocal/ax_ext_check_header.m4
+#usr/share/aclocal/ax_ext_have_lib.m4
+#usr/share/aclocal/ax_extend_srcdir.m4
+#usr/share/aclocal/ax_extra_dist.m4
+#usr/share/aclocal/ax_f77_cmain_fflags.m4
+#usr/share/aclocal/ax_f90_header.m4
+#usr/share/aclocal/ax_f90_internal_headmod.m4
+#usr/share/aclocal/ax_f90_library.m4
+#usr/share/aclocal/ax_f90_library_setup.m4
+#usr/share/aclocal/ax_f90_module.m4
+#usr/share/aclocal/ax_f90_module_extension.m4
+#usr/share/aclocal/ax_f90_module_flag.m4
+#usr/share/aclocal/ax_fc_check_define.m4
+#usr/share/aclocal/ax_file_escapes.m4
+#usr/share/aclocal/ax_find_hamcrest.m4
+#usr/share/aclocal/ax_find_junit.m4
+#usr/share/aclocal/ax_find_scala_stdlib.m4
+#usr/share/aclocal/ax_forceinline.m4
+#usr/share/aclocal/ax_func_accept_argtypes.m4
+#usr/share/aclocal/ax_func_getopt_long.m4
+#usr/share/aclocal/ax_func_memmove.m4
+#usr/share/aclocal/ax_func_mkdir.m4
+#usr/share/aclocal/ax_func_posix_memalign.m4
+#usr/share/aclocal/ax_func_snprintf.m4
+#usr/share/aclocal/ax_func_which_gethostbyname_r.m4
+#usr/share/aclocal/ax_func_which_getservbyname_r.m4
+#usr/share/aclocal/ax_gcc_archflag.m4
+#usr/share/aclocal/ax_gcc_builtin.m4
+#usr/share/aclocal/ax_gcc_const_call.m4
+#usr/share/aclocal/ax_gcc_func_attribute.m4
+#usr/share/aclocal/ax_gcc_lib.m4
+#usr/share/aclocal/ax_gcc_libgcc_eh.m4
+#usr/share/aclocal/ax_gcc_libsupcxx.m4
+#usr/share/aclocal/ax_gcc_malloc_call.m4
+#usr/share/aclocal/ax_gcc_var_attribute.m4
+#usr/share/aclocal/ax_gcc_warn_unused_result.m4
+#usr/share/aclocal/ax_gcc_x86_avx_xgetbv.m4
+#usr/share/aclocal/ax_gcc_x86_cpu_supports.m4
+#usr/share/aclocal/ax_gcc_x86_cpuid.m4
+#usr/share/aclocal/ax_generate_changelog.m4
+#usr/share/aclocal/ax_gnu_autotest.m4
+#usr/share/aclocal/ax_have_adns.m4
+#usr/share/aclocal/ax_have_epoll.m4
+#usr/share/aclocal/ax_have_poll.m4
+#usr/share/aclocal/ax_have_qt.m4
+#usr/share/aclocal/ax_have_select.m4
+#usr/share/aclocal/ax_include_strcasecmp.m4
+#usr/share/aclocal/ax_install_files.m4
+#usr/share/aclocal/ax_int128.m4
+#usr/share/aclocal/ax_is_release.m4
+#usr/share/aclocal/ax_java_check_class.m4
+#usr/share/aclocal/ax_java_options.m4
+#usr/share/aclocal/ax_jni_include_dir.m4
+#usr/share/aclocal/ax_lapack.m4
+#usr/share/aclocal/ax_lib_beecrypt.m4
+#usr/share/aclocal/ax_lib_cgal_core.m4
+#usr/share/aclocal/ax_lib_crypto.m4
+#usr/share/aclocal/ax_lib_curl.m4
+#usr/share/aclocal/ax_lib_ev.m4
+#usr/share/aclocal/ax_lib_expat.m4
+#usr/share/aclocal/ax_lib_firebird.m4
+#usr/share/aclocal/ax_lib_gcrypt.m4
+#usr/share/aclocal/ax_lib_gdal.m4
+#usr/share/aclocal/ax_lib_hdf5.m4
+#usr/share/aclocal/ax_lib_id3.m4
+#usr/share/aclocal/ax_lib_libkml.m4
+#usr/share/aclocal/ax_lib_metis.m4
+#usr/share/aclocal/ax_lib_mysql.m4
+#usr/share/aclocal/ax_lib_mysqlcppconn.m4
+#usr/share/aclocal/ax_lib_netcdf4.m4
+#usr/share/aclocal/ax_lib_nettle.m4
+#usr/share/aclocal/ax_lib_nokalva.m4
+#usr/share/aclocal/ax_lib_oracle_occi.m4
+#usr/share/aclocal/ax_lib_oracle_oci.m4
+#usr/share/aclocal/ax_lib_orbit2.m4
+#usr/share/aclocal/ax_lib_postgresql.m4
+#usr/share/aclocal/ax_lib_readline.m4
+#usr/share/aclocal/ax_lib_samtools.m4
+#usr/share/aclocal/ax_lib_socket_nsl.m4
+#usr/share/aclocal/ax_lib_sqlite3.m4
+#usr/share/aclocal/ax_lib_tabix.m4
+#usr/share/aclocal/ax_lib_taglib.m4
+#usr/share/aclocal/ax_lib_trace.m4
+#usr/share/aclocal/ax_lib_upnp.m4
+#usr/share/aclocal/ax_lib_wad.m4
+#usr/share/aclocal/ax_lib_xalan.m4
+#usr/share/aclocal/ax_lib_xerces.m4
+#usr/share/aclocal/ax_lib_xml_security.m4
+#usr/share/aclocal/ax_libgcj_jar.m4
+#usr/share/aclocal/ax_libtoolize_cflags.m4
+#usr/share/aclocal/ax_llvm.m4
+#usr/share/aclocal/ax_lua.m4
+#usr/share/aclocal/ax_luarocks_rock.m4
+#usr/share/aclocal/ax_maintainer_mode_auto_silent.m4
+#usr/share/aclocal/ax_missing_prog.m4
+#usr/share/aclocal/ax_mpi.m4
+#usr/share/aclocal/ax_mpip.m4
+#usr/share/aclocal/ax_ms_cpprest.m4
+#usr/share/aclocal/ax_need_awk.m4
+#usr/share/aclocal/ax_normalize_path.m4
+#usr/share/aclocal/ax_not_enable_frame_pointer.m4
+#usr/share/aclocal/ax_numeric_namedlevel.m4
+#usr/share/aclocal/ax_open62541_check_h.m4
+#usr/share/aclocal/ax_open62541_check_lib.m4
+#usr/share/aclocal/ax_open62541_path.m4
+#usr/share/aclocal/ax_openmp.m4
+#usr/share/aclocal/ax_patch_libtool_changing_cmds_ifs.m4
+#usr/share/aclocal/ax_path_bdb.m4
+#usr/share/aclocal/ax_path_generic.m4
+#usr/share/aclocal/ax_path_lib_pcre.m4
+#usr/share/aclocal/ax_path_milter.m4
+#usr/share/aclocal/ax_path_missing.m4
+#usr/share/aclocal/ax_perl_ext.m4
+#usr/share/aclocal/ax_perl_ext_flags.m4
+#usr/share/aclocal/ax_perl_module_version.m4
+#usr/share/aclocal/ax_pgsql_priv_root.m4
+#usr/share/aclocal/ax_pkg_check_modules.m4
+#usr/share/aclocal/ax_pkg_mico.m4
+#usr/share/aclocal/ax_pkg_swig.m4
+#usr/share/aclocal/ax_prefix_config_h.m4
+#usr/share/aclocal/ax_prepend_flag.m4
+#usr/share/aclocal/ax_print_to_file.m4
+#usr/share/aclocal/ax_printf_size_t.m4
+#usr/share/aclocal/ax_prog_apache.m4
+#usr/share/aclocal/ax_prog_bison.m4
+#usr/share/aclocal/ax_prog_bison_version.m4
+#usr/share/aclocal/ax_prog_cc_char_subscripts.m4
+#usr/share/aclocal/ax_prog_cc_for_build.m4
+#usr/share/aclocal/ax_prog_cc_mpi.m4
+#usr/share/aclocal/ax_prog_cp_s.m4
+#usr/share/aclocal/ax_prog_crontab.m4
+#usr/share/aclocal/ax_prog_cxx_for_build.m4
+#usr/share/aclocal/ax_prog_cxx_mpi.m4
+#usr/share/aclocal/ax_prog_date.m4
+#usr/share/aclocal/ax_prog_dotnetcore_version.m4
+#usr/share/aclocal/ax_prog_doxygen.m4
+#usr/share/aclocal/ax_prog_emacs.m4
+#usr/share/aclocal/ax_prog_f77_mpi.m4
+#usr/share/aclocal/ax_prog_fasm.m4
+#usr/share/aclocal/ax_prog_fasm_opt.m4
+#usr/share/aclocal/ax_prog_fc_mpi.m4
+#usr/share/aclocal/ax_prog_fig2dev.m4
+#usr/share/aclocal/ax_prog_flex.m4
+#usr/share/aclocal/ax_prog_flex_version.m4
+#usr/share/aclocal/ax_prog_gjs.m4
+#usr/share/aclocal/ax_prog_guile_version.m4
+#usr/share/aclocal/ax_prog_haxe_version.m4
+#usr/share/aclocal/ax_prog_help2man.m4
+#usr/share/aclocal/ax_prog_hla.m4
+#usr/share/aclocal/ax_prog_hla_opt.m4
+#usr/share/aclocal/ax_prog_httpd.m4
+#usr/share/aclocal/ax_prog_jar.m4
+#usr/share/aclocal/ax_prog_java.m4
+#usr/share/aclocal/ax_prog_java_cc.m4
+#usr/share/aclocal/ax_prog_java_works.m4
+#usr/share/aclocal/ax_prog_javac.m4
+#usr/share/aclocal/ax_prog_javac_works.m4
+#usr/share/aclocal/ax_prog_javadoc.m4
+#usr/share/aclocal/ax_prog_javah.m4
+#usr/share/aclocal/ax_prog_masm.m4
+#usr/share/aclocal/ax_prog_masm_opt.m4
+#usr/share/aclocal/ax_prog_md5sum.m4
+#usr/share/aclocal/ax_prog_modprobe.m4
+#usr/share/aclocal/ax_prog_mysql.m4
+#usr/share/aclocal/ax_prog_mysqladmin.m4
+#usr/share/aclocal/ax_prog_mysqld.m4
+#usr/share/aclocal/ax_prog_mysqlimport.m4
+#usr/share/aclocal/ax_prog_mysqlshow.m4
+#usr/share/aclocal/ax_prog_nasm.m4
+#usr/share/aclocal/ax_prog_nasm_opt.m4
+#usr/share/aclocal/ax_prog_perl_modules.m4
+#usr/share/aclocal/ax_prog_perl_version.m4
+#usr/share/aclocal/ax_prog_pgclient.m4
+#usr/share/aclocal/ax_prog_python_version.m4
+#usr/share/aclocal/ax_prog_robot.m4
+#usr/share/aclocal/ax_prog_ruby_version.m4
+#usr/share/aclocal/ax_prog_scala.m4
+#usr/share/aclocal/ax_prog_scalac.m4
+#usr/share/aclocal/ax_prog_scp.m4
+#usr/share/aclocal/ax_prog_splint.m4
+#usr/share/aclocal/ax_prog_ssh.m4
+#usr/share/aclocal/ax_prog_tasm.m4
+#usr/share/aclocal/ax_prog_tasm_opt.m4
+#usr/share/aclocal/ax_prog_tcl.m4
+#usr/share/aclocal/ax_prog_xsltproc.m4
+#usr/share/aclocal/ax_prog_yasm.m4
+#usr/share/aclocal/ax_prog_yasm_opt.m4
+#usr/share/aclocal/ax_prototype.m4
+#usr/share/aclocal/ax_prototype_accept.m4
+#usr/share/aclocal/ax_prototype_getsockname.m4
+#usr/share/aclocal/ax_prototype_setsockopt.m4
+#usr/share/aclocal/ax_pthread.m4
+#usr/share/aclocal/ax_python.m4
+#usr/share/aclocal/ax_python_config_var.m4
+#usr/share/aclocal/ax_python_devel.m4
+#usr/share/aclocal/ax_python_embed.m4
+#usr/share/aclocal/ax_python_module.m4
+#usr/share/aclocal/ax_python_module_version.m4
+#usr/share/aclocal/ax_r_package.m4
+#usr/share/aclocal/ax_recursive_eval.m4
+#usr/share/aclocal/ax_require_defined.m4
+#usr/share/aclocal/ax_require_one_func.m4
+#usr/share/aclocal/ax_restore_flags.m4
+#usr/share/aclocal/ax_restore_flags_with_prefix.m4
+#usr/share/aclocal/ax_rpm_init.m4
+#usr/share/aclocal/ax_ruby_devel.m4
+#usr/share/aclocal/ax_ruby_ext.m4
+#usr/share/aclocal/ax_save_flags.m4
+#usr/share/aclocal/ax_save_flags_with_prefix.m4
+#usr/share/aclocal/ax_set_default_paths_system.m4
+#usr/share/aclocal/ax_short_sleep.m4
+#usr/share/aclocal/ax_silent_mode.m4
+#usr/share/aclocal/ax_sip_devel.m4
+#usr/share/aclocal/ax_spec_file.m4
+#usr/share/aclocal/ax_spec_package_version.m4
+#usr/share/aclocal/ax_split_version.m4
+#usr/share/aclocal/ax_string_strcasecmp.m4
+#usr/share/aclocal/ax_strings_strcasecmp.m4
+#usr/share/aclocal/ax_struct_semun.m4
+#usr/share/aclocal/ax_subdir_files.m4
+#usr/share/aclocal/ax_subdirs_configure.m4
+#usr/share/aclocal/ax_subst_with.m4
+#usr/share/aclocal/ax_swig_enable_cxx.m4
+#usr/share/aclocal/ax_swig_multi_module_support.m4
+#usr/share/aclocal/ax_swig_python.m4
+#usr/share/aclocal/ax_switch_flags.m4
+#usr/share/aclocal/ax_sys_dev_poll.m4
+#usr/share/aclocal/ax_sys_largefile_sensitive.m4
+#usr/share/aclocal/ax_sys_perlsharpbang.m4
+#usr/share/aclocal/ax_sys_weak_alias.m4
+#usr/share/aclocal/ax_sysv_ipc.m4
+#usr/share/aclocal/ax_tls.m4
+#usr/share/aclocal/ax_trilinos_amesos.m4
+#usr/share/aclocal/ax_trilinos_base.m4
+#usr/share/aclocal/ax_trilinos_epetra.m4
+#usr/share/aclocal/ax_trilinos_epetraext.m4
+#usr/share/aclocal/ax_trilinos_epetraext_hdf5.m4
+#usr/share/aclocal/ax_trilinos_rtop.m4
+#usr/share/aclocal/ax_trilinos_rythmos.m4
+#usr/share/aclocal/ax_trilinos_teuchos.m4
+#usr/share/aclocal/ax_trilinos_thyra.m4
+#usr/share/aclocal/ax_trilinos_thyra_epetra.m4
+#usr/share/aclocal/ax_trilinos_thyra_epetraext.m4
+#usr/share/aclocal/ax_try_awk_anyout.m4
+#usr/share/aclocal/ax_try_awk_expout.m4
+#usr/share/aclocal/ax_try_compile_java.m4
+#usr/share/aclocal/ax_try_run_java.m4
+#usr/share/aclocal/ax_type_socklen_t.m4
+#usr/share/aclocal/ax_upload.m4
+#usr/share/aclocal/ax_valgrind_check.m4
+#usr/share/aclocal/ax_var_pop.m4
+#usr/share/aclocal/ax_var_push.m4
+#usr/share/aclocal/ax_var_timezone_externals.m4
+#usr/share/aclocal/ax_very_nice.m4
+#usr/share/aclocal/ax_warning_default_aclocaldir.m4
+#usr/share/aclocal/ax_warning_default_pkgconfig.m4
+#usr/share/aclocal/ax_wint_t.m4
+#usr/share/aclocal/ax_with_apxs.m4
+#usr/share/aclocal/ax_with_build_path.m4
+#usr/share/aclocal/ax_with_curses.m4
+#usr/share/aclocal/ax_with_curses_extra.m4
+#usr/share/aclocal/ax_with_dmalloc.m4
+#usr/share/aclocal/ax_with_mpatrol.m4
+#usr/share/aclocal/ax_with_prog.m4
+#usr/share/aclocal/ax_xercesc.m4
+#usr/share/aclocal/ax_xsdcxx.m4
+#usr/share/aclocal/ax_xtra_classpath.m4
+#usr/share/aclocal/ax_zmq.m4
+#usr/share/aclocal/ax_zoneinfo.m4
+#usr/share/doc/autoconf-archive
+#usr/share/doc/autoconf-archive/AUTHORS
+#usr/share/doc/autoconf-archive/COPYING
+#usr/share/doc/autoconf-archive/COPYING.EXCEPTION
+#usr/share/doc/autoconf-archive/README
+#usr/share/info/autoconf-archive.info
+#usr/share/info/autoconf-archive.info-1
+#usr/share/info/autoconf-archive.info-2
+#usr/share/info/autoconf-archive.info-3
+#usr/share/info/autoconf-archive.info-4
diff --git a/lfs/autoconf-archive b/lfs/autoconf-archive
new file mode 100644
index 000000000..ed7c77fbc
--- /dev/null
+++ b/lfs/autoconf-archive
@@ -0,0 +1,77 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2023.02.20
+
+THISAPP = autoconf-archive-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = a72469e61a6ef702cbf4e30712c7dbe36369da7dad6e2312eb7026af41a989a47ded0a27975349486b69155f9e8199f89720dc57f98440b2766294a0f8755ee6
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 1f2bb572b..a6da4f608 100755
--- a/make.sh
+++ b/make.sh
@@ -1408,6 +1408,7 @@ build_system() {
[ "${BUILD_ARCH}" = "riscv64" ] && lfsmake2 gcc PASS=A
lfsmake2 zstd
lfsmake2 autoconf
+ lfsmake2 autoconf-archive
lfsmake2 automake
lfsmake2 help2man
lfsmake2 libtool
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 11/19] berkeley: Fix build with GCC 14
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (8 preceding siblings ...)
2024-08-19 10:05 ` [PATCH 10/19] autoconf-archive: New package Michael Tremer
@ 2024-08-19 10:06 ` Michael Tremer
2024-08-19 10:06 ` [PATCH 12/19] squidguard: Fix compliation " Michael Tremer
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 10841 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/berkeley | 3 +
.../db-5.2.28-sqlite-configure-path.patch | 11 +
src/patches/db-5.3.28-clang16.patch | 325 ++++++++++++++++++
3 files changed, 339 insertions(+)
create mode 100644 src/patches/db-5.2.28-sqlite-configure-path.patch
create mode 100644 src/patches/db-5.3.28-clang16.patch
diff --git a/lfs/berkeley b/lfs/berkeley
index 0ef917015..264097c59 100644
--- a/lfs/berkeley
+++ b/lfs/berkeley
@@ -71,6 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/db-5.3.28-clang16.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/db-5.2.28-sqlite-configure-path.patch
+ cd $(DIR_APP)/dist && ./s_config
cd $(DIR_APP) && sed -i "s/\(__atomic_compare_exchange\)/\1_db/" src/dbinc/atomic.h
cd $(DIR_APP)/build_unix && ../dist/configure \
--prefix=/usr \
diff --git a/src/patches/db-5.2.28-sqlite-configure-path.patch b/src/patches/db-5.2.28-sqlite-configure-path.patch
new file mode 100644
index 000000000..cfbe2a7ff
--- /dev/null
+++ b/src/patches/db-5.2.28-sqlite-configure-path.patch
@@ -0,0 +1,11 @@
+--- a/dist/aclocal/sql.m4
++++ b/dist/aclocal/sql.m4
+@@ -91,7 +91,7 @@
+ # !!! END COPIED from autoconf distribution
+
+ sqlite_dir=$srcdir/../lang/sql/sqlite
+-(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline" && cat build_config.h >> config.h) || exit 1
++(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline" && cat build_config.h >> config.h) || exit 1
+
+ # Configure JDBC if --enable-jdbc
+ if test "$db_cv_jdbc" != "no"; then
diff --git a/src/patches/db-5.3.28-clang16.patch b/src/patches/db-5.3.28-clang16.patch
new file mode 100644
index 000000000..aab73d87a
--- /dev/null
+++ b/src/patches/db-5.3.28-clang16.patch
@@ -0,0 +1,325 @@
+https://bugs.gentoo.org/883413
+--- a/dist/aclocal/clock.m4
++++ b/dist/aclocal/clock.m4
+@@ -20,12 +20,14 @@ esac
+ # existence to mean the clock really exists.
+ AC_CACHE_CHECK([for clock_gettime monotonic clock], db_cv_clock_monotonic, [
+ AC_TRY_RUN([
++#include <time.h>
+ #include <sys/time.h>
+-main() {
++int main(void) {
+ struct timespec t;
+ return (clock_gettime(CLOCK_MONOTONIC, &t) != 0);
+ }], db_cv_clock_monotonic=yes, db_cv_clock_monotonic=no,
+ AC_TRY_LINK([
++#include <time.h>
+ #include <sys/time.h>], [
+ struct timespec t;
+ clock_gettime(CLOCK_MONOTONIC, &t);
+--- a/dist/aclocal/mmap.m4
++++ b/dist/aclocal/mmap.m4
+@@ -29,6 +29,7 @@ if test "$mmap_ok" = "yes" ; then
+ * system to system.
+ */
+ #include <stdio.h>
++ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -42,13 +43,12 @@ if test "$mmap_ok" = "yes" ; then
+ #define MAP_FAILED (-1)
+ #endif
+
+- int catch_sig(sig)
+- int sig;
++ void catch_sig(int sig)
+ {
+ exit(1);
+ }
+
+- main() {
++ int main(void) {
+ const char *underlying;
+ unsigned gapsize;
+ char *base;
+--- a/dist/aclocal/mutex.m4
++++ b/dist/aclocal/mutex.m4
+@@ -5,7 +5,7 @@ AC_DEFUN(AM_PTHREADS_SHARED, [
+ AC_TRY_RUN([
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main(void) {
+ pthread_cond_t cond;
+ pthread_mutex_t mutex;
+ pthread_condattr_t condattr;
+@@ -49,7 +49,7 @@ AC_DEFUN(AM_PTHREADS_PRIVATE, [
+ AC_TRY_RUN([
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main(void) {
+ pthread_cond_t cond;
+ pthread_mutex_t mutex;
+ pthread_condattr_t condattr;
+@@ -89,7 +89,7 @@ AC_DEFUN(AM_PTHREADS_CONDVAR_DUPINITCHK, [
+ AC_TRY_RUN([
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main(void) {
+ pthread_cond_t cond;
+ pthread_condattr_t condattr;
+ exit(pthread_condattr_init(&condattr) ||
+@@ -110,7 +110,7 @@ AC_DEFUN(AM_PTHREADS_RWLOCKVAR_DUPINITCHK, [
+ AC_TRY_RUN([
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main(void) {
+ pthread_rwlock_t rwlock;
+ pthread_rwlockattr_t rwlockattr;
+ exit(pthread_rwlockattr_init(&rwlockattr) ||
+@@ -227,6 +227,7 @@ if test "$db_cv_mutex" = no; then
+ # LWP threads: _lwp_XXX
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_LINK([
++ #include <stdlib.h>
+ #include <synch.h>],[
+ static lwp_mutex_t mi = SHAREDMUTEX;
+ static lwp_cond_t ci = SHAREDCV;
+@@ -243,6 +244,7 @@ if test "$db_cv_mutex" = no; then
+ LIBS="$LIBS -lthread"
+ AC_TRY_LINK([
+ #include <thread.h>
++ #include <stdlib.h>
+ #include <synch.h>],[
+ mutex_t mutex;
+ cond_t cond;
+@@ -258,6 +260,7 @@ if test "$db_cv_mutex" = no; then
+ if test "$db_cv_mutex" = no -o "$db_cv_mutex" = ui_only; then
+ AC_TRY_LINK([
+ #include <thread.h>
++ #include <stdlib.h>
+ #include <synch.h>],[
+ mutex_t mutex;
+ cond_t cond;
+@@ -282,7 +285,7 @@ if test "$db_cv_mutex" = no; then
+ # x86/gcc: FreeBSD, NetBSD, BSD/OS, Linux
+ AC_TRY_COMPILE(,[
+ #if (defined(i386) || defined(__i386__)) && defined(__GNUC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -291,7 +294,7 @@ if test "$db_cv_mutex" = no; then
+ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
+ AC_TRY_COMPILE(,[
+ #if (defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -314,7 +317,7 @@ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if defined(__sparc__) && defined(__GNUC__)
+ asm volatile ("membar #StoreStore|#StoreLoad|#LoadStore");
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -356,7 +359,7 @@ AC_TRY_LINK([
+ msem_init(&x, 0);
+ msem_lock(&x, 0);
+ msem_unlock(&x, 0);
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -373,7 +376,7 @@ AC_TRY_LINK([
+ msem_init(&x, 0);
+ msem_lock(&x, 0);
+ msem_unlock(&x, 0);
+- exit(0);
++ return 0;
+ ], [db_cv_mutex=UNIX/msem_init])
+ fi
+
+@@ -395,7 +398,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if defined(__USLC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -452,7 +455,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if defined(__alpha) && defined(__DECC)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -463,7 +466,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if defined(__alpha) && defined(__GNUC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -474,7 +477,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if defined(__arm__) && defined(__GNUC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -485,7 +488,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if (defined(__mips) || defined(__mips__)) && defined(__GNUC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -496,7 +499,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if (defined(__hppa) || defined(__hppa__)) && defined(__GNUC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -507,7 +510,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if (defined(__powerpc__) || defined(__ppc__)) && defined(__GNUC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -518,7 +521,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if (defined(mc68020) || defined(sun3)) && defined(__GNUC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -529,7 +532,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if defined(__MVS__) && defined(__IBMC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -540,7 +543,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if defined(__s390__) && defined(__GNUC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -551,7 +554,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if defined(__ia64) && defined(__GNUC__)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -562,7 +565,7 @@ fi
+ if test "$db_cv_mutex" = no; then
+ AC_TRY_COMPILE(,[
+ #if defined(_UTS)
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -910,9 +913,9 @@ fi
+ if test "$db_cv_atomic" = no; then
+ AC_TRY_COMPILE(,[
+ #if ((defined(i386) || defined(__i386__)) && defined(__GNUC__))
+- exit(0);
++ return 0;
+ #elif ((defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__))
+- exit(0);
++ return 0;
+ #else
+ FAIL TO COMPILE/LINK
+ #endif
+@@ -921,6 +924,7 @@ fi
+
+ if test "$db_cv_atomic" = no; then
+ AC_TRY_LINK([
++#include <stdlib.h>
+ #include <sys/atomic.h>],[
+ volatile unsigned val = 1;
+ exit (atomic_inc_uint_nv(&val) != 2 ||
+--- a/dist/aclocal/sequence.m4
++++ b/dist/aclocal/sequence.m4
+@@ -43,7 +43,9 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [
+ # test, which won't test for the appropriate printf format strings.
+ if test "$db_cv_build_sequence" = "yes"; then
+ AC_TRY_RUN([
+- main() {
++ #include <stdio.h>
++ #include <string.h>
++ int main(void) {
+ $db_cv_seq_type l;
+ unsigned $db_cv_seq_type u;
+ char buf@<:@100@:>@;
+@@ -59,7 +61,10 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [
+ return (1);
+ return (0);
+ }],, [db_cv_build_sequence="no"],
+- AC_TRY_LINK(,[
++ AC_TRY_LINK([
++ #include <stdio.h>
++ #include <string.h>
++ ],[
+ $db_cv_seq_type l;
+ unsigned $db_cv_seq_type u;
+ char buf@<:@100@:>@;
+--- a/dist/aclocal/types.m4
++++ b/dist/aclocal/types.m4
+@@ -69,7 +69,7 @@ AC_SUBST(stdint_h_decl)
+ AC_MSG_CHECKING(for stdint.h)
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <stdint.h>
+- int main() {
++ int main(void) {
+ uint_least8_t x=0;
+ return x;
+ }])],[AC_MSG_RESULT(yes)
+@@ -77,7 +77,7 @@ if test "$db_cv_cxx" = "yes"; then
+ AC_MSG_CHECKING([if stdint.h can be used by C++])
+ AC_LANG_PUSH(C++)
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <stdint.h>
+- int main() {
++ int main(void) {
+ uint_least8_t x=0;
+ return x;
+ }])],[AC_MSG_RESULT(yes)
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 12/19] squidguard: Fix compliation with GCC 14
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (9 preceding siblings ...)
2024-08-19 10:06 ` [PATCH 11/19] berkeley: Fix build with GCC 14 Michael Tremer
@ 2024-08-19 10:06 ` Michael Tremer
2024-08-19 10:06 ` [PATCH 13/19] ghostscript: Fix compilation " Michael Tremer
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3289 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/squidguard | 2 +
src/patches/squidguard-1.6.0-configure.patch | 55 ++++++++++++++++++++
src/patches/squidguard-1.6.0-stdlib.patch | 22 ++++++++
3 files changed, 79 insertions(+)
create mode 100644 src/patches/squidguard-1.6.0-configure.patch
create mode 100644 src/patches/squidguard-1.6.0-stdlib.patch
diff --git a/lfs/squidguard b/lfs/squidguard
index c5decc79f..b42110c5f 100644
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -72,6 +72,8 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidguard-1.6.0-stdlib.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidguard-1.6.0-configure.patch
cd $(DIR_APP) && ./autogen.sh
cd $(DIR_APP) && ./configure \
--prefix=/usr \
diff --git a/src/patches/squidguard-1.6.0-configure.patch b/src/patches/squidguard-1.6.0-configure.patch
new file mode 100644
index 000000000..22c87498d
--- /dev/null
+++ b/src/patches/squidguard-1.6.0-configure.patch
@@ -0,0 +1,55 @@
+--- squidguard-1.6.0/configure.ac~ 2024-08-06 10:40:16.797400705 +0000
++++ squidguard-1.6.0/configure.ac 2024-08-06 10:41:36.321245621 +0000
+@@ -237,7 +237,7 @@
+ {
+ LDAP *p;
+ p = ldap_init("localhost", LDAP_PORT);
+- exit(0);
++ return 0;
+ }
+ ]])],,[
+ echo
+@@ -358,8 +358,8 @@
+ #endif
+ ver = major + ((float) minor / 1000);
+ if (ver >= 2.006)
+- exit (0);
+- exit (1);
++ return 0;
++ return 1;
+ }
+ ]])],
+ [db_ok_version=yes],
+@@ -396,8 +396,8 @@
+ #endif
+ ver = major + ((float) minor / 1000);
+ if (ver > 2.007 && ver < 3.002)
+- exit (1);
+- exit (0);
++ return 1;
++ return 0;
+ }
+ ]])],
+ [db_ok_version=yes],
+@@ -432,8 +432,8 @@
+ #endif
+ ver = major + ((float) minor / 1000);
+ if (ver >= 3.002)
+- exit (0);
+- exit (1);
++ return 0;
++ return 1;
+ }
+ ]])],
+ [dbg2_ok_version=yes],
+@@ -460,8 +460,8 @@
+ #endif
+ ver = major + ((float) minor / 1000);
+ if (ver >= 4.002)
+- exit (0);
+- exit (1);
++ return 0;
++ return 1;
+ }
+ ]])],
+ [dbg3_ok_version=yes],
diff --git a/src/patches/squidguard-1.6.0-stdlib.patch b/src/patches/squidguard-1.6.0-stdlib.patch
new file mode 100644
index 000000000..51489b32d
--- /dev/null
+++ b/src/patches/squidguard-1.6.0-stdlib.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac 2022-12-15 10:33:13.845801113 +0300
++++ b/configure.ac 2022-12-15 10:33:39.828949903 +0300
+@@ -342,6 +342,9 @@
+ LIBS="$LIBS -ldb"
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <db.h>
++ #ifdef HAVE_STDLIB_H
++ #include <stdlib.h>
++ #endif
+ int main()
+ {
+ int major, minor, patch;
+@@ -377,6 +378,9 @@
+
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <db.h>
++ #ifdef HAVE_STDLIB_H
++ #include <stdlib.h>
++ #endif
+ int main()
+ {
+ int major, minor, patch;
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 13/19] ghostscript: Fix compilation with GCC 14
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (10 preceding siblings ...)
2024-08-19 10:06 ` [PATCH 12/19] squidguard: Fix compliation " Michael Tremer
@ 2024-08-19 10:06 ` Michael Tremer
2024-08-19 10:06 ` [PATCH 14/19] collectd: Ignore compiler errors Michael Tremer
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2099 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/ghostscript | 1 +
.../ghostscript-10.03.1-bug707649.patch | 29 +++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 src/patches/ghostscript-10.03.1-bug707649.patch
diff --git a/lfs/ghostscript b/lfs/ghostscript
index f198a0d1b..0709f1800 100644
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -89,6 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && rm -rf expat freetype icclib jasper jpeg jpegxr \
lcms lcms2 libpng openjpeg zlib cups/libs
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ghostscript-10.03.1-bug707649.patch
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
diff --git a/src/patches/ghostscript-10.03.1-bug707649.patch b/src/patches/ghostscript-10.03.1-bug707649.patch
new file mode 100644
index 000000000..0d6fb7583
--- /dev/null
+++ b/src/patches/ghostscript-10.03.1-bug707649.patch
@@ -0,0 +1,29 @@
+From 90cabe08422afdd16bac5dd9217602679d943045 Mon Sep 17 00:00:00 2001
+From: Ken Sharp <Ken.Sharp(a)artifex.com>
+Date: Fri, 8 Mar 2024 09:19:05 +0000
+Subject: Bug #707649 - fix apply_sasl in error cases.
+
+Forgot to dereference the pointers before assigning the values, if we
+get non-fatal errors returned from stringprep.
+---
+ pdf/pdf_sec.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pdf/pdf_sec.c b/pdf/pdf_sec.c
+index 565ae80ca..7e8f6719d 100644
+--- a/pdf/pdf_sec.c
++++ b/pdf/pdf_sec.c
+@@ -183,8 +183,8 @@ static int apply_sasl(pdf_context *ctx, char *Password, int Len, char **NewPassw
+ * this easy: the errors we want to ignore are the ones with
+ * codes less than 100. */
+ if ((int)err < 100) {
+- NewPassword = Password;
+- NewLen = Len;
++ *NewPassword = Password;
++ *NewLen = Len;
+ return 0;
+ }
+
+--
+cgit v1.2.3
+
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 14/19] collectd: Ignore compiler errors
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (11 preceding siblings ...)
2024-08-19 10:06 ` [PATCH 13/19] ghostscript: Fix compilation " Michael Tremer
@ 2024-08-19 10:06 ` Michael Tremer
2024-08-19 10:06 ` [PATCH 15/19] syslinux: Fix build with GCC 14 Michael Tremer
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 660 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/collectd | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lfs/collectd b/lfs/collectd
index 24f5bc632..d1d4ea721 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -36,7 +36,11 @@ PROG = collectd
DEPS =
-CFLAGS += -fcommon -Wno-error=deprecated-declarations
+CFLAGS += \
+ -fcommon \
+ -Wno-error=deprecated-declarations \
+ -Wno-error=implicit-function-declaration \
+ -Wno-error=incompatible-pointer-types
###############################################################################
# Top-level Rules
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 15/19] syslinux: Fix build with GCC 14
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (12 preceding siblings ...)
2024-08-19 10:06 ` [PATCH 14/19] collectd: Ignore compiler errors Michael Tremer
@ 2024-08-19 10:06 ` Michael Tremer
2024-08-19 10:06 ` [PATCH 16/19] tftpd: " Michael Tremer
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3476 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/syslinux | 1 +
...inux-6.04-pre1-fix-build-with-gcc-14.patch | 61 +++++++++++++++++++
2 files changed, 62 insertions(+)
create mode 100644 src/patches/syslinux-6.04-pre1-fix-build-with-gcc-14.patch
diff --git a/lfs/syslinux b/lfs/syslinux
index 150e4071e..98719560e 100644
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -80,6 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04_replace-builtin-strlen-that-appears-to-get-optimized.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04_pre1-fcommon.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04-libinstaller-Fix-build-with-glibc-2.36.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04-pre1-fix-build-with-gcc-14.patch
# Build
cd $(DIR_APP) && make bios $(MAKETUNING)
diff --git a/src/patches/syslinux-6.04-pre1-fix-build-with-gcc-14.patch b/src/patches/syslinux-6.04-pre1-fix-build-with-gcc-14.patch
new file mode 100644
index 000000000..61de20eae
--- /dev/null
+++ b/src/patches/syslinux-6.04-pre1-fix-build-with-gcc-14.patch
@@ -0,0 +1,61 @@
+From 321433861cc9cd3c7e0ee02830e561bc0f956998 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Sun, 4 Feb 2024 11:46:02 -0500
+Subject: [PATCH] Fix build with GCC 14
+
+com32/lib/syslinux/debug.c: In function ‘syslinux_debug’:
+com32/lib/syslinux/debug.c:91:5: error: implicit declaration of function ‘printf’
+
+com32/libupload/upload_tftp.c: In function ‘upload_tftp_write’:
+com32/libupload/upload_tftp.c:64:11: error: implicit declaration of function ‘tftp_put’
+
+com32/chain/chain.c: In function ‘main’:
+com32/chain/chain.c:517:44: error: passing argument 3 of ‘loadfile’ from incompatible pointer type
+com32/include/syslinux/loadfile.h:11:37: note: expected ‘size_t *’ but argument is of type ‘addr_t *’
+
+---
+ com32/chain/chain.c | 2 +-
+ com32/lib/syslinux/debug.c | 1 +
+ com32/libupload/tftp.h | 3 +++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/com32/chain/chain.c b/com32/chain/chain.c
+index 4e9e32d..b11b880 100644
+--- a/com32/chain/chain.c
++++ b/com32/chain/chain.c
+@@ -514,7 +514,7 @@ int main(int argc, char *argv[])
+ if (opt.file) {
+ fdat.base = (opt.fseg << 4) + opt.foff;
+
+- if (loadfile(opt.file, &fdat.data, &fdat.size)) {
++ if (loadfile(opt.file, &fdat.data, (size_t*)&fdat.size)) {
+ error("Couldn't read the boot file.");
+ goto bail;
+ }
+diff --git a/com32/lib/syslinux/debug.c b/com32/lib/syslinux/debug.c
+index d9ab863..e8f53d5 100644
+--- a/com32/lib/syslinux/debug.c
++++ b/com32/lib/syslinux/debug.c
+@@ -1,6 +1,7 @@
+ #include <linux/list.h>
+ #include <string.h>
+ #include <stdbool.h>
++#include <stdio.h>
+
+ #ifdef DYNAMIC_DEBUG
+
+diff --git a/com32/libupload/tftp.h b/com32/libupload/tftp.h
+index 323dc16..09aa40b 100644
+--- a/com32/libupload/tftp.h
++++ b/com32/libupload/tftp.h
+@@ -19,4 +19,7 @@ TFTP_OK = 11, /* Not in RFC */
+ };
+
+ extern const char *tftp_string_error_message[];
++
++extern int tftp_put(struct url_info *url, int flags, struct inode *inode,
++ const char **redir, char *data, int data_length);
+ #endif
+--
+2.43.0
+
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 16/19] tftpd: Fix build with GCC 14
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (13 preceding siblings ...)
2024-08-19 10:06 ` [PATCH 15/19] syslinux: Fix build with GCC 14 Michael Tremer
@ 2024-08-19 10:06 ` Michael Tremer
2024-08-19 10:06 ` [PATCH 17/19] telnet: " Michael Tremer
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2782 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/tftpd | 3 ++-
src/patches/tftp-c99.patch | 50 ++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
create mode 100644 src/patches/tftp-c99.patch
diff --git a/lfs/tftpd b/lfs/tftpd
index 8a3e7bd31..ebd8fee85 100644
--- a/lfs/tftpd
+++ b/lfs/tftpd
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tftpd
-PAK_VER = 4
+PAK_VER = 5
DEPS =
@@ -83,6 +83,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tftp-c99.patch
cd $(DIR_APP) && ./configure --prefix=/usr --without-tcpwrappers
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/src/patches/tftp-c99.patch b/src/patches/tftp-c99.patch
new file mode 100644
index 000000000..40bb4ddd6
--- /dev/null
+++ b/src/patches/tftp-c99.patch
@@ -0,0 +1,50 @@
+The glibc headers do not declare bsd_signal by default. Call signal
+instead, which is the same function as bsd_signal in current glibc.
+
+This fixes implicit function declarations and avoids build issues with
+future compilers.
+
+diff --git a/tftp/main.c b/tftp/main.c
+index fcf5a25ac654954b..7e399d414ca0dd2b 100644
+--- a/tftp/main.c
++++ b/tftp/main.c
+@@ -310,7 +310,7 @@ int main(int argc, char *argv[])
+ sp->s_proto = (char *)"udp";
+ }
+
+- bsd_signal(SIGINT, intr);
++ signal(SIGINT, intr);
+
+ if (peerargc) {
+ /* Set peer */
+@@ -791,7 +791,7 @@ void intr(int sig)
+ {
+ (void)sig; /* Quiet unused warning */
+
+- bsd_signal(SIGALRM, SIG_IGN);
++ signal(SIGALRM, SIG_IGN);
+ alarm(0);
+ siglongjmp(toplevel, -1);
+ }
+diff --git a/tftp/tftp.c b/tftp/tftp.c
+index 109848c4f9a5ad4e..d31553be5b76e305 100644
+--- a/tftp/tftp.c
++++ b/tftp/tftp.c
+@@ -85,7 +85,7 @@ void tftp_sendfile(int fd, const char *name, const char *mode)
+ is_request = 1; /* First packet is the actual WRQ */
+ amount = 0;
+
+- bsd_signal(SIGALRM, timer);
++ signal(SIGALRM, timer);
+ do {
+ if (is_request) {
+ size = makerequest(WRQ, name, dp, mode) - 4;
+@@ -191,7 +191,7 @@ void tftp_recvfile(int fd, const char *name, const char *mode)
+ firsttrip = 1;
+ amount = 0;
+
+- bsd_signal(SIGALRM, timer);
++ signal(SIGALRM, timer);
+ do {
+ if (firsttrip) {
+ size = makerequest(RRQ, name, ap, mode);
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 17/19] telnet: Fix build with GCC 14
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (14 preceding siblings ...)
2024-08-19 10:06 ` [PATCH 16/19] tftpd: " Michael Tremer
@ 2024-08-19 10:06 ` Michael Tremer
2024-08-19 10:06 ` [PATCH 18/19] lcdproc: " Michael Tremer
2024-08-19 10:06 ` [PATCH 19/19] gnupg: This package no longer seems to be able to link against LDAP Michael Tremer
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 776 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/telnet | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lfs/telnet b/lfs/telnet
index 239c79e43..712098fe1 100644
--- a/lfs/telnet
+++ b/lfs/telnet
@@ -34,12 +34,15 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = telnet
-PAK_VER = 1
+PAK_VER = 2
DEPS =
SERVICES =
+# Fixes build with GCC 14
+CFLAGS += -Wno-error=implicit-function-declaration -Wno-error=int-conversion
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 18/19] lcdproc: Fix build with GCC 14
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (15 preceding siblings ...)
2024-08-19 10:06 ` [PATCH 17/19] telnet: " Michael Tremer
@ 2024-08-19 10:06 ` Michael Tremer
2024-08-19 10:06 ` [PATCH 19/19] gnupg: This package no longer seems to be able to link against LDAP Michael Tremer
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/lcdproc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lfs/lcdproc b/lfs/lcdproc
index aae338325..f15440bd8 100644
--- a/lfs/lcdproc
+++ b/lfs/lcdproc
@@ -40,7 +40,7 @@ DEPS =
SERVICES = lcdproc
-CFLAGS += -fcommon
+CFLAGS += -fcommon -Wno-error=implicit-function-declaration
###############################################################################
# Top-level Rules
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 19/19] gnupg: This package no longer seems to be able to link against LDAP
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
` (16 preceding siblings ...)
2024-08-19 10:06 ` [PATCH 18/19] lcdproc: " Michael Tremer
@ 2024-08-19 10:06 ` Michael Tremer
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-08-19 10:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/gnupg | 1 -
1 file changed, 1 deletion(-)
diff --git a/config/rootfiles/common/gnupg b/config/rootfiles/common/gnupg
index edd2beccb..5b16f0326 100644
--- a/config/rootfiles/common/gnupg
+++ b/config/rootfiles/common/gnupg
@@ -6,7 +6,6 @@ usr/bin/gpg
usr/lib/gnupg/gpgkeys_curl
usr/lib/gnupg/gpgkeys_finger
usr/lib/gnupg/gpgkeys_hkp
-usr/lib/gnupg/gpgkeys_ldap
#usr/share/gnupg
#usr/share/gnupg/FAQ
#usr/share/gnupg/options.skel
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-08-19 10:06 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
2024-08-19 10:05 ` [PATCH 01/19] expect: Fix build with GCC 14.2 Michael Tremer
2024-08-19 10:05 ` [PATCH 02/19] coreutils: Drop uname patch Michael Tremer
2024-08-19 10:05 ` [PATCH 03/19] glibc: Update to 2.40 Michael Tremer
2024-08-19 10:05 ` [PATCH 04/19] make.sh: Bump the toolchain version Michael Tremer
2024-08-19 10:05 ` [PATCH 06/19] misc-progs: Fix compilation with GCC 14 Michael Tremer
2024-08-19 10:05 ` [PATCH 07/19] whatmask: Fix build " Michael Tremer
2024-08-19 10:05 ` [PATCH 08/19] ntp: " Michael Tremer
2024-08-19 10:05 ` [PATCH 09/19] setup: Fix compilation issues " Michael Tremer
2024-08-19 10:05 ` [PATCH 10/19] autoconf-archive: New package Michael Tremer
2024-08-19 10:06 ` [PATCH 11/19] berkeley: Fix build with GCC 14 Michael Tremer
2024-08-19 10:06 ` [PATCH 12/19] squidguard: Fix compliation " Michael Tremer
2024-08-19 10:06 ` [PATCH 13/19] ghostscript: Fix compilation " Michael Tremer
2024-08-19 10:06 ` [PATCH 14/19] collectd: Ignore compiler errors Michael Tremer
2024-08-19 10:06 ` [PATCH 15/19] syslinux: Fix build with GCC 14 Michael Tremer
2024-08-19 10:06 ` [PATCH 16/19] tftpd: " Michael Tremer
2024-08-19 10:06 ` [PATCH 17/19] telnet: " Michael Tremer
2024-08-19 10:06 ` [PATCH 18/19] lcdproc: " Michael Tremer
2024-08-19 10:06 ` [PATCH 19/19] gnupg: This package no longer seems to be able to link against LDAP Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox