commit: ad1f5d0a2eef8f1d1e9684a902f9cdff2174220b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Nov 7 09:09:38 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Nov 7 09:10:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad1f5d0a
net-analyzer/nsat: don't pass -ansi The configure check for setpgrp was getting confused by the configure script always passing -ansi (!). This may or may not fix the build on musl (given -ansi will disable any extensions). Bug: https://bugs.gentoo.org/713636 Closes: https://bugs.gentoo.org/897836 Closes: https://bugs.gentoo.org/900030 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/nsat/files/nsat-1.5-no-ansi.patch | 53 ++++++++++++++++++++++ .../{nsat-1.5-r6.ebuild => nsat-1.5-r7.ebuild} | 1 + 2 files changed, 54 insertions(+) diff --git a/net-analyzer/nsat/files/nsat-1.5-no-ansi.patch b/net-analyzer/nsat/files/nsat-1.5-no-ansi.patch new file mode 100644 index 000000000000..80e96ea7a8f2 --- /dev/null +++ b/net-analyzer/nsat/files/nsat-1.5-no-ansi.patch @@ -0,0 +1,53 @@ +--- a/configure.in ++++ b/configure.in +@@ -42,20 +42,20 @@ case "`${UNAME}`" in + AC_DEFINE(HAVE_LINUX) + AC_DEFINE(MY_HDRINCL,3) + if test x$LEETCC = xyes; then +- CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DLINUX' ++ CCOPTS='-Wall -O6 -funroll-loops -fPIC -DLINUX' + else + CCOPTS="${CFLAGS} -DLINUX" + fi + SMBCFLAGS="${CCOPTS} -Wall -DLINUX -DNETGROUP -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2" + SMBLFLAGS="-lnsl -lcrypt" +- CFLAGS="${CCOPTS} -Wall -ansi -fPIC -DLINUX" ++ CFLAGS="${CCOPTS} -Wall -fPIC -DLINUX" + ;; + *Darwin* | *Mac* | *MAC*) + AC_MSG_RESULT(found MAC OS X) + AC_DEFINE(HAVE_BSD) + AC_DEFINE(MY_HDRINCL,2) + if test x$LEETCC = xyes; then +- CCOPTS='-Wall -O -funroll-loops -ansi -fPIC -DBSD44 -DDARWIN' ++ CCOPTS='-Wall -O -funroll-loops -fPIC -DBSD44 -DDARWIN' + else + CCOPTS='-DBSD44 -DOBSD' + fi +@@ -68,7 +68,7 @@ fi + AC_DEFINE(HAVE_BSD) + AC_DEFINE(MY_HDRINCL,2) + if test x$LEETCC = xyes; then +- CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44 -DOBSD' ++ CCOPTS='-Wall -O6 -funroll-loops -fPIC -DBSD44 -DOBSD' + else + CCOPTS='-DBSD44 -DOBSD' + fi +@@ -81,7 +81,7 @@ fi + AC_DEFINE(HAVE_BSD) + AC_DEFINE(MY_HDRINCL,2) + if test x$LEETCC = xyes; then +- CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44' ++ CCOPTS='-Wall -O6 -funroll-loops -fPIC -DBSD44' + else + CCOPTS='-DBSD44' + fi +@@ -96,7 +96,7 @@ fi + AC_CHECK_LIB(socket, socket, [ CLIB="$CLIB -lsocket " ], AC_MSG_ERROR(libsocket not found.)) + AC_CHECK_LIB(nsl, gethostbyname, [ CLIB="$CLIB -lnsl " ], AC_MSG_ERROR(libnsl not found.)) + if test x$LEETCC = xyes; then +- CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DSOLARIS' ++ CCOPTS='-Wall -O6 -funroll-loops -fPIC -DSOLARIS' + else + CCOPTS='-DSOLARIS' + fi diff --git a/net-analyzer/nsat/nsat-1.5-r6.ebuild b/net-analyzer/nsat/nsat-1.5-r7.ebuild similarity index 97% rename from net-analyzer/nsat/nsat-1.5-r6.ebuild rename to net-analyzer/nsat/nsat-1.5-r7.ebuild index 47f0c0c1f494..eccfd92a7ab8 100644 --- a/net-analyzer/nsat/nsat-1.5-r6.ebuild +++ b/net-analyzer/nsat/nsat-1.5-r7.ebuild @@ -37,6 +37,7 @@ PATCHES=( "${FILESDIR}"/${P}-libtirpc.patch "${FILESDIR}"/${P}-amd64-compat.patch "${FILESDIR}"/${P}-configure-dash.patch + "${FILESDIR}"/${P}-no-ansi.patch ) src_prepare() {
