Received: by mail.netbsd.org (Postfix, from userid 605) id B268E84D2F; Wed, 24 Mar 2021 08:38:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EDA5784CED for ; Wed, 24 Mar 2021 08:38:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id KJYQInGUBcLq for ; Wed, 24 Mar 2021 08:38:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 591A484CE0 for ; Wed, 24 Mar 2021 08:38:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 52688FA95; Wed, 24 Mar 2021 08:38:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_161657508391700" MIME-Version: 1.0 Date: Wed, 24 Mar 2021 08:38:03 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/net/dante To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20210324083803.52688FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_161657508391700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Wed Mar 24 08:38:03 UTC 2021 Modified Files: pkgsrc/net/dante: distinfo pkgsrc/net/dante/patches: patch-ab Log Message: dante: fix buildling on Darwin (disable universal binaries) To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/dante/distinfo cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/dante/patches/patch-ab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_161657508391700 Content-Disposition: inline Content-Length: 3675 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=utf-8 Modified files: Index: pkgsrc/net/dante/distinfo diff -u pkgsrc/net/dante/distinfo:1.17 pkgsrc/net/dante/distinfo:1.18 --- pkgsrc/net/dante/distinfo:1.17 Sat Feb 9 19:51:09 2019 +++ pkgsrc/net/dante/distinfo Wed Mar 24 08:38:03 2021 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2019/02/09 19:51:09 rhialto Exp $ +$NetBSD: distinfo,v 1.18 2021/03/24 08:38:03 adam Exp $ SHA1 (dante-1.4.2.tar.gz) = 671c4df0f0689620c8e7cfe43bae3d7f89c8cc4e RMD160 (dante-1.4.2.tar.gz) = 8d48b6efa0d551215943c31dc140a0dccac950b9 SHA512 (dante-1.4.2.tar.gz) = 38d4e3086f851fac78e2dbe7f928eba3b8bf1fb9219c42d929b9e1ea324882b0ae583dc59964a2772af4202dfc977387c6f723b320b5abbbe70e1990cd94f53b Size (dante-1.4.2.tar.gz) = 1307254 bytes SHA1 (patch-aa) = a201b0ec844a2dd610cd4bfb5ffce2f37132fc77 -SHA1 (patch-ab) = 77890d2eab9f2e487c571c5c3a1b7f181918f382 +SHA1 (patch-ab) = 9566cf94bd52d3df4214232c8bdf77ccb71b0fd3 SHA1 (patch-dlib_interposition.c) = 9af00c8251e71b519e0dfdffaa3c27303e33881f Index: pkgsrc/net/dante/patches/patch-ab diff -u pkgsrc/net/dante/patches/patch-ab:1.11 pkgsrc/net/dante/patches/patch-ab:1.12 --- pkgsrc/net/dante/patches/patch-ab:1.11 Sun Feb 12 01:01:19 2017 +++ pkgsrc/net/dante/patches/patch-ab Wed Mar 24 08:38:03 2021 @@ -1,15 +1,29 @@ -$NetBSD: patch-ab,v 1.11 2017/02/12 01:01:19 mef Exp $ +$NetBSD: patch-ab,v 1.12 2021/03/24 08:38:03 adam Exp $ -o Delete the -Werror flag in order to recognise the type of sa_len: +Do not build universal binaries on Darwin. +Delete the -Werror flag in order to recognise the type of sa_len: In function ‘main’: warning: variable ‘sa_len_ptr’ set but not used [-Wunused-but-set-variable] uint8_t *sa_len_ptr; -o Add support for DragonFly BSD +Add support for DragonFly BSD ---- configure.orig 2014-09-03 14:52:29.000000000 +0000 +--- configure.orig 2017-02-03 14:17:15.000000000 +0000 +++ configure -@@ -12804,8 +12804,6 @@ if test x"${debug_enabled}" = xt; then +@@ -12439,12 +12439,8 @@ case $host in + HW=`uname -m` + case $HW in + ppc*) +- CFLAGS="$CFLAGS${CFLAGS:+ }-arch ppc -arch ppc64" +- LDFLAGS="$LDLAGS${LDLAGS:+ }-arch ppc -arch ppc64" + ;; + *) +- CFLAGS="$CFLAGS${CFLAGS:+ }-arch i386 -arch x86_64" +- LDFLAGS="$LDLAGS${LDLAGS:+ }-arch i386 -arch x86_64" + ;; + esac + fi +@@ -13008,8 +13004,6 @@ if test x"${debug_enabled}" = xt; then else #autoconf_compflags is set to "-g -O2" with GCC #override CFLAGS when running configure to avoid this @@ -18,7 +32,7 @@ o Add support for DragonFly BSD case $COMPTYPE in gcc) -@@ -15424,7 +15422,7 @@ if test x"${have_sa_len}" != x; then +@@ -15631,7 +15625,7 @@ if test x"${have_sa_len}" != x; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_len type" >&5 $as_echo_n "checking for sa_len type... " >&6; } oCFLAGS="$CFLAGS" @@ -27,7 +41,7 @@ o Add support for DragonFly BSD unset sa_len_type_found for type in uint8_t "unsigned char"; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -24719,8 +24717,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ +@@ -24944,8 +24938,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ #include #include @@ -41,7 +55,7 @@ o Add support for DragonFly BSD ); int main () -@@ -24740,9 +24743,18 @@ cat >>confdefs.h <<_ACEOF +@@ -24965,9 +24964,18 @@ cat >>confdefs.h <<_ACEOF #define HAVE_PROT_GETHOSTBYADDR_1 const char * _ACEOF @@ -61,7 +75,7 @@ o Add support for DragonFly BSD cat >>confdefs.h <<_ACEOF #define HAVE_PROT_GETHOSTBYADDR_3 int -@@ -67655,7 +67667,7 @@ problems. +@@ -67823,7 +67831,7 @@ problems. fi VINFO=README.latest --_----------=_161657508391700--