Skip to contentSkip to conversation

syslog-ng: Remove references to ACLOCALEXTRAPATH

PATCH New Khem Raj 1 participant 5 messages Jan 24, 2025

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/5 syslog-ng: Remove references to ACLOCALEXTRAPATH

ACLOCALEXTRAPATH is gone in core with commit 878e1517d4890b31332a506ce903d57e1d7dff87

---
 meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb +1 -1
index 588a38126b..7ad7ddf381 100644
@@ -68,7 +68,7 @@ do_configure:prepend() {
 	olddir=$(pwd)
 	cd ${AUTOTOOLS_SCRIPT_PATH}
 
-	ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} -I ${S}/m4 ${ACLOCALEXTRAPATH} || die "extra autoreconf execution failed."
+	ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} -I ${S}/m4 || die "extra autoreconf execution failed."
 
 	cd $olddir
 }
author
#1 lore raw

PATCH 2/5 ncftp: Replace references to ACLOCALEXTRAPATH

- ACLOCALEXTRAPATH is gone in core with commit 878e1517d4890b31332a506ce903d57e1d7dff87
- Add patches to fix build with latest clang and gcc
- Drop disabling warnings as the fixes above take care of the problem

---
 .../ncftp/0001-ncftp-3.2.7-fix-gcc14.patch    | 20 +++++
 .../ncftp/0002-ncftp-3.2.7-fix-clang.patch    | 73 +++++++++++++++++++
 .../recipes-daemons/ncftp/ncftp_3.2.7.bb      |  8 +-
 3 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100644 meta-networking/recipes-daemons/ncftp/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch
 create mode 100644 meta-networking/recipes-daemons/ncftp/ncftp/0002-ncftp-3.2.7-fix-clang.patch
meta-networking/recipes-daemons/ncftp/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch new file +20 -0
new file mode 100644
index 0000000000..9b8a0c778b
@@ -0,0 +1,20 @@
+fix select arg detection
+
+Reference:
+ https://bugs.gentoo.org/921487
+
+Upstream-Status: Inappropriate [unresponsive contact email address]
+
+Signed-off-by: Yegor Yefremov <[email protected]>
+Signed-off-by: Khem Raj <[email protected]>
+--- a/autoconf_local/aclocal.m4
++++ b/autoconf_local/aclocal.m4
+@@ -4196,7 +4196,7 @@ AC_MSG_CHECKING([types of arguments for
+ #include <sys/select.h>
+ #endif
+ #include <sys/socket.h>	/* MG: always incl */
+-extern select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl
++extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl
+         [ac_not_found=no ; break 3],ac_not_found=yes)
+       done
+      done
meta-networking/recipes-daemons/ncftp/ncftp/0002-ncftp-3.2.7-fix-clang.patch new file +73 -0

73 lines not on this page · raw message

meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb +3 -5
index de111cac05..b27bf86154 100644
@@ -9,6 +9,8 @@ SRC_URI = "https://www.ncftp.com/public_ftp/ncftp/${BP}-src.tar.xz \
            file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \
            file://unistd.patch \
            file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \
+           file://0001-ncftp-3.2.7-fix-gcc14.patch \
+           file://0002-ncftp-3.2.7-fix-clang.patch \
            "
 SRC_URI[sha256sum] = "d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8"
 
@@ -20,7 +22,7 @@ PACKAGECONFIG ??= ""
 PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,,"
 
 EXTRA_OECONF = "--disable-precomp --disable-universal ac_cv_path_TAR=tar"
-ACLOCALEXTRAPATH:append = " -I ${S}/autoconf_local"
+EXTRA_AUTORECONF += "-I ${S}/autoconf_local"
 
 do_install () {
     install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
@@ -28,7 +30,3 @@ do_install () {
         'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \
         install
 }
-
-# http://errors.yoctoproject.org/Errors/Details/766888/
-# ncftp/3.2.7/ncftp-3.2.7/config.h:358:28: error: passing argument 2 of 'select' from incompatible pointer type [-Wincompatible-pointer-types]
-CFLAGS += "-Wno-error=incompatible-pointer-types"
author
#2 lore raw

PATCH 3/5 php: Drop references to ACLOCALDIR

In reply to Khem Raj

ACLOCALDIR is dropped from core

---
 meta-oe/recipes-devtools/php/php_8.2.26.bb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
meta-oe/recipes-devtools/php/php_8.2.26.bb +5 -4
index 61b127373a..053242413f 100644
@@ -162,11 +162,12 @@ do_install:append:class-native() {
     rm -rf ${D}/${PHP_LIBDIR}/php/.[a-z]*
 }
 
-ACLOCALDIR = "${STAGING_DATADIR}/aclocal"
-
 do_install:prepend() {
-    cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \
-        ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4
+    cat ${STAGING_DATADIR}/aclocal/libtool.m4 \
+    ${STAGING_DATADIR}/aclocal/lt~obsolete.m4 \
+    ${STAGING_DATADIR}/aclocal/ltoptions.m4 \
+    ${STAGING_DATADIR}/aclocal/ltsugar.m4 \
+    ${STAGING_DATADIR}/aclocal/ltversion.m4 > ${S}/build/libtool.m4
 }
 
 do_install:prepend:class-target() {
author
#3 lore raw

PATCH 4/5 tigervnc: Replace using --system-acdir with --aclocal-path

In reply to Khem Raj

This synchronises it with latest autotools class

---
 meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.1.bb +1 -1
index 47f59c69cf..4d2bb1f063 100644
@@ -96,7 +96,7 @@ do_configure:append () {
     if [ -d ${STAGING_DATADIR}/aclocal -a "${STAGING_DATADIR_NATIVE}/aclocal" != "${STAGING_DATADIR}/aclocal" ]; then
         cp-noerror ${STAGING_DATADIR}/aclocal/ ${ACLOCALDIR}/
     fi
-    ACLOCAL="aclocal --system-acdir=${ACLOCALDIR}/" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
+    ACLOCAL="aclocal --aclocal-path=${ACLOCALDIR}/" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
     chmod +x ./configure
     ${CACHED_CONFIGUREVARS} ./configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
     cd $olddir
author
#4 lore raw

PATCH 5/5 ntp: Cache snprintf/vsnprintf C99'ness checks

In reply to Khem Raj

we cache hw_cv_func_snprintf_c99 and hw_cv_func_vsnprintf_c99 in meta/site/common-linux but somehow configure now tries to compute it and since it uses ac_try_run they fail in cross compilation, as a result configure decides to use rpl_snprintf and rpl_vsnprintf functions and they fail during linking stage

---
 meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb +2 -0
index 302cf9915f..1f4cba1bbd 100644
@@ -60,6 +60,8 @@ inherit autotools update-rc.d useradd systemd pkgconfig
 EXTRA_OECONF += "--with-net-snmp-config=no \
                  --without-ntpsnmpd \
                  ac_cv_header_readline_history_h=no \
+                 hw_cv_func_snprintf_c99=yes \
+                 hw_cv_func_vsnprintf_c99=yes \
                  --with-yielding_select=yes \
                  --with-locfile=redhat \
                  --without-rpath \