CVS commit: pkgsrc/sysutils/amanda-common

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Apr 14 22:58:24 UTC 2023

Modified Files:
        pkgsrc/sysutils/amanda-common: Makefile.common distinfo
Added Files:
        pkgsrc/sysutils/amanda-common/patches: patch-config_amanda_libs.m4

Log Message:
amanda-common: Configure fixes

The configure script creates massive amounts of spam when using NetBSD's
sh due to the non-standard test(1) args.

For some reason, the test for compiler flag -msse4.2 is failing, even
though it's present in the cc -v --help output (is cwrappers doing
something strange?). For now, commit a workaround. The package is actually
doing runtime detection of SSE4.2 properly, but expects compiler support
for -msse4.2 to be provided on x86.

PR 57130


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/sysutils/amanda-common/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/amanda-common/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/amanda-common/patches/patch-config_amanda_libs.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/amanda-common/Makefile.common
diff -u pkgsrc/sysutils/amanda-common/Makefile.common:1.45 pkgsrc/sysutils/amanda-common/Makefile.common:1.46
--- pkgsrc/sysutils/amanda-common/Makefile.common:1.45  Mon Nov  4 21:28:40 2019
+++ pkgsrc/sysutils/amanda-common/Makefile.common       Fri Apr 14 22:58:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2019/11/04 21:28:40 rillig Exp $
+# $NetBSD: Makefile.common,v 1.46 2023/04/14 22:58:24 nia Exp $
 
 # used by sysutils/amanda-common/Makefile
 # used by sysutils/amanda-client/Makefile
@@ -61,6 +61,14 @@ SUBST_SED.bool=              -e '/undef bool/d'
 GNU_CONFIGURE=         yes
 CONFIGURE_ENV+=                ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q}
 CONFIGURE_ENV+=                GNUTAR=${TOOLS_GTAR:Q}
+
+# I am not quite sure what is causing the test for -msse4.2 to fail
+# (perhaps cwrappers?). It is basically grepping the output of
+# "cc -v --help" which does in fact contain the correct value.
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+CONFIGURE_ENV+=                SSE42_CFLAGS=-msse4.2
+.endif
+
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --localstatedir=${AMANDA_VAR:Q}
 CONFIGURE_ARGS+=       --with-tmpdir=${AMANDA_TMP:Q}

Index: pkgsrc/sysutils/amanda-common/distinfo
diff -u pkgsrc/sysutils/amanda-common/distinfo:1.25 pkgsrc/sysutils/amanda-common/distinfo:1.26
--- pkgsrc/sysutils/amanda-common/distinfo:1.25 Tue Oct 26 11:19:19 2021
+++ pkgsrc/sysutils/amanda-common/distinfo      Fri Apr 14 22:58:24 2023
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.25 2021/10/26 11:19:19 nia Exp $
+$NetBSD: distinfo,v 1.26 2023/04/14 22:58:24 nia Exp $
 
 BLAKE2s (amanda-3.3.9.tar.gz) = 2177c4b698edf1c9a7c8328a3423a7f75321e922107b54cac4d6823e91d855bc
 SHA512 (amanda-3.3.9.tar.gz) = 345670a20cff335453e8dcbf457d1fcdb9f266e4a03d729c2b1ba762f4fac323de4a87713d0fd54c11ca244a08dc97fb8c641625f7fa81cb241b3c17748b1b7e
 Size (amanda-3.3.9.tar.gz) = 4673301 bytes
 SHA1 (patch-Makefile.am) = 172dc9b2419c0acb989034e382e4137e69b051e2
-SHA1 (patch-Makefile.in) = 391b7bb8cd0e8d0b90f36b6a76877118dd468a01
 SHA1 (patch-amandad-src_Makefile.am) = bdff2c06da0ee6c88237c56568fe20c5cefedd7a
 SHA1 (patch-application-src_Makefile.am) = 8b448d2c7dbda4d731d6985374e2a6786b0ac8d1
-SHA1 (patch-autogen) = a5a7addd91ddb62e3270c149fa3af1ca6c56a1bd
 SHA1 (patch-client-src_Makefile.am) = 641ef76fd1ea413b416704e1e52e25a93a596442
 SHA1 (patch-client-src_getfsent.c) = 903a921b8679ddcff1fdd838ffdce16a6d8da46f
 SHA1 (patch-client-src_sendbackup-dump.c) = aea1aca0bbcdab0c393b012a592cbc5ca458acec
@@ -20,6 +18,7 @@ SHA1 (patch-common-src_security-util.h) 
 SHA1 (patch-config_amanda_config_flags.m4) = cf79825e49b52b0c0440185291c8cf91ff32f9b2
 SHA1 (patch-config_amanda_dumpers.m4) = ebd2f9932cb5e9e883cedb626a4ca774af87365d
 SHA1 (patch-config_amanda_krb5-security.m4) = c82af0e106e49b59994b40f12ed5b1c165a8497f
+SHA1 (patch-config_amanda_libs.m4) = 133751743a80913f11f1f9aec7c32feb04afdb28
 SHA1 (patch-config_macro-archive_xsltproc.m4) = 20324db1ce3db016fa89fe39df5a8133c7766693
 SHA1 (patch-device-src_Makefile.am) = 29fd554033ff0ff7b1d98a08306f157ced7324c5
 SHA1 (patch-example_Makefile.am) = 8d2dac1abdc473fbf94489bcb620a42a665fd27a

Added files:

Index: pkgsrc/sysutils/amanda-common/patches/patch-config_amanda_libs.m4
diff -u /dev/null pkgsrc/sysutils/amanda-common/patches/patch-config_amanda_libs.m4:1.1
--- /dev/null   Fri Apr 14 22:58:24 2023
+++ pkgsrc/sysutils/amanda-common/patches/patch-config_amanda_libs.m4   Fri Apr 14 22:58:24 2023
@@ -0,0 +1,35 @@
+$NetBSD: patch-config_amanda_libs.m4,v 1.1 2023/04/14 22:58:24 nia Exp $
+
+Shell portability.
+
+--- config/amanda/libs.m4.orig 2016-02-09 22:52:50.000000000 +0000
++++ config/amanda/libs.m4
+@@ -391,22 +391,22 @@ x=CURLOPT_VERBOSE;
+       LIBCURL_USE_OPENSSL=yes
+      _libcurl_configures=`$_libcurl_config --configure`
+      for _libcurl_configure in $_libcurl_configures ; do
+-      if [[[ $_libcurl_configure = \'--with-nss* ]]]; then
++      if [[ $_libcurl_configure = \'--with-nss* ]]; then
+           LIBCURL_USE_NSS=yes
+       fi
+-      if [[[ $_libcurl_configure = \'--without-nss* ]]]; then
++      if [[ $_libcurl_configure = \'--without-nss* ]]; then
+           LIBCURL_USE_NSS=no
+       fi
+-      if [[[ $_libcurl_configure = \'--with-gnutls* ]]]; then
++      if [[ $_libcurl_configure = \'--with-gnutls* ]]; then
+           LIBCURL_USE_GNUTLS=yes
+       fi
+-      if [[[ $_libcurl_configure = \'--without-gnutls* ]]]; then
++      if [[ $_libcurl_configure = \'--without-gnutls* ]]; then
+           LIBCURL_USE_GNUTLS=no
+       fi
+-      if [[[ $_libcurl_configure = \'--with-ssl* ]]]; then
++      if [[ $_libcurl_configure = \'--with-ssl* ]]; then
+           LIBCURL_USE_OPENSSL=yes
+       fi
+-      if [[[ $_libcurl_configure = \'--without-ssl* ]]]; then
++      if [[ $_libcurl_configure = \'--without-ssl* ]]; then
+           LIBCURL_USE_OPENSSL=no
+       fi
+      done