From e1557b6e4200dff9a5f32e93ab749f8b30e15ddb Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 29 Jul 2024 11:05:02 +0000 Subject: [PATCH 1/2] cxxtools: allow build with automake 1.17 --- .../patches/cxxtools-crosscompile.patch | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch b/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch index 85fedbdf02..1eaa8d2ce0 100644 --- a/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch +++ b/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch @@ -1,20 +1,6 @@ -diff -Naur cxxtools-2.2/configure cxxtools-2.2.patch/configure ---- cxxtools-2.2/configure 2013-04-21 21:13:11.000000000 +0200 -+++ cxxtools-2.2.patch/configure 2014-01-03 20:34:53.404660480 +0100 -@@ -17316,8 +17316,8 @@ - - - --CXXTOOLS_CXXFLAGS='-I${includedir}' --CXXTOOLS_LDFLAGS='-L${libdir} -lcxxtools' -+CXXTOOLS_CXXFLAGS='' -+CXXTOOLS_LDFLAGS='-lcxxtools' - - - -diff -Naur cxxtools-2.2/configure.ac cxxtools-2.2.patch/configure.ac ---- cxxtools-2.2/configure.ac 2013-04-20 23:31:50.000000000 +0200 -+++ cxxtools-2.2.patch/configure.ac 2014-01-03 20:26:32.064005192 +0100 +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2013-04-20 23:31:50.000000000 +0200 ++++ b/configure.ac 2014-01-03 20:26:32.064005192 +0100 @@ -106,8 +106,8 @@ AC_PROG_LIBTOOL @@ -26,3 +12,26 @@ diff -Naur cxxtools-2.2/configure.ac cxxtools-2.2.patch/configure.ac AC_SUBST(CXXTOOLS_CXXFLAGS) AC_SUBST(CXXTOOLS_LDFLAGS) +diff -Naur a/configure b/configure +--- a/configure 2013-04-21 21:13:11.000000000 +0200 ++++ b/configure 2014-01-03 20:34:53.404660480 +0100 +@@ -3119,7 +3119,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-am__api_version='1.16' ++am__api_version='1.17' + + + +@@ -17316,8 +17316,8 @@ + + + +-CXXTOOLS_CXXFLAGS='-I${includedir}' +-CXXTOOLS_LDFLAGS='-L${libdir} -lcxxtools' ++CXXTOOLS_CXXFLAGS='' ++CXXTOOLS_LDFLAGS='-lcxxtools' + + + From 7186f13746896f14a6e6c088977d082777be0d0b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 29 Jul 2024 11:34:30 +0000 Subject: [PATCH 2/2] nmap: allow build with automake 1.17 --- ...-0001-allow-build-with-automake-1-17.patch | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 packages/addons/addon-depends/network-tools-depends/nmap/patches/nmap-0001-allow-build-with-automake-1-17.patch diff --git a/packages/addons/addon-depends/network-tools-depends/nmap/patches/nmap-0001-allow-build-with-automake-1-17.patch b/packages/addons/addon-depends/network-tools-depends/nmap/patches/nmap-0001-allow-build-with-automake-1-17.patch new file mode 100644 index 0000000000..8f4812afe9 --- /dev/null +++ b/packages/addons/addon-depends/network-tools-depends/nmap/patches/nmap-0001-allow-build-with-automake-1-17.patch @@ -0,0 +1,74 @@ +diff -Nur a/libpcre/aclocal.m4 b/libpcre/aclocal.m4 +--- a/libpcre/aclocal.m4 2023-06-24 01:53:07.000000000 +0000 ++++ b/libpcre/aclocal.m4 2024-07-29 11:29:45.699525807 +0000 +@@ -32,10 +32,10 @@ + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.16' ++[am__api_version='1.17' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.16.5], [], ++m4_if([$1], [1.17], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -51,7 +51,7 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.16.5])dnl ++[AM_AUTOMAKE_VERSION([1.17])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +diff -Nur a/libpcre/configure b/libpcre/configure +--- a/libpcre/configure 2024-02-28 16:06:30.000000000 +0000 ++++ b/libpcre/configure 2024-07-29 11:25:14.134081052 +0000 +@@ -2758,7 +2758,7 @@ + + + +-am__api_version='1.16' ++am__api_version='1.17' + + + +diff -Nur a/libssh2/aclocal.m4 b/libssh2/aclocal.m4 +--- a/libssh2/aclocal.m4 2024-02-28 17:39:06.000000000 +0000 ++++ b/libssh2/aclocal.m4 2024-07-29 11:30:13.873078377 +0000 +@@ -32,10 +32,10 @@ + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.16' ++[am__api_version='1.17' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.16.5], [], ++m4_if([$1], [1.17], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -51,7 +51,7 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.16.5])dnl ++[AM_AUTOMAKE_VERSION([1.17])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +diff -Nur a/libssh2/configure b/libssh2/configure +--- a/libssh2/configure 2024-02-28 17:39:06.000000000 +0000 ++++ b/libssh2/configure 2024-07-29 11:25:39.590945455 +0000 +@@ -3236,7 +3236,7 @@ + fi + + LIBSSH2VER=`$SED -ne 's/^#define LIBSSH2_VERSION *"\(.*\)"/\1/p' ${srcdir}/include/libssh2.h` +-am__api_version='1.16' ++am__api_version='1.17' + + + # Find a good install program. We prefer a C program (faster),