Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_163698240424980"
MIME-Version: 1.0
Date: Mon, 15 Nov 2021 13:20:04 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/devel/m4
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20211115132004.A6796FAEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_163698240424980
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Mon Nov 15 13:20:04 UTC 2021

Modified Files:
	pkgsrc/devel/m4: distinfo
Added Files:
	pkgsrc/devel/m4/patches: patch-configure patch-m4_sparcv8+.m4

Log Message:
m4: fix building on sparcv8

from John D. Baker in PR pkg/56498


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/m4/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/m4/patches/patch-configure \
    pkgsrc/devel/m4/patches/patch-m4_sparcv8+.m4

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


--_----------=_163698240424980
Content-Disposition: inline
Content-Length: 2548
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/m4/distinfo
diff -u pkgsrc/devel/m4/distinfo:1.51 pkgsrc/devel/m4/distinfo:1.52
--- pkgsrc/devel/m4/distinfo:1.51	Tue Oct 26 10:15:38 2021
+++ pkgsrc/devel/m4/distinfo	Mon Nov 15 13:20:04 2021
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.51 2021/10/26 10:15:38 nia Exp $
+$NetBSD: distinfo,v 1.52 2021/11/15 13:20:04 nia Exp $
 
 BLAKE2s (m4-1.4.19.tar.gz) = f1380114d839935b2afa53fdd7162dc5df2bbeb6d5eab48528916a138f483cbc
 SHA512 (m4-1.4.19.tar.gz) = f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2
 Size (m4-1.4.19.tar.gz) = 2953876 bytes
+SHA1 (patch-configure) = 941bba8b1a10c3fc305d20abdb247cf45e44d534
 SHA1 (patch-lib_strerror_override.c) = 29905fecf6c92f75c4999f1e3cb56e14fe2f4aae
+SHA1 (patch-m4_sparcv8+.m4) = 761e592a700ea47ac0ba15d960f073115005dedd

Added files:

Index: pkgsrc/devel/m4/patches/patch-configure
diff -u /dev/null pkgsrc/devel/m4/patches/patch-configure:1.1
--- /dev/null	Mon Nov 15 13:20:04 2021
+++ pkgsrc/devel/m4/patches/patch-configure	Mon Nov 15 13:20:04 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2021/11/15 13:20:04 nia Exp $
+
+PR pkg/56498: "devel/m4" build fails on netbsd-9/sparc
+
+--- configure.orig	2021-05-28 18:49:43.000000000 +0000
++++ configure
+@@ -8835,7 +8835,7 @@ rm -f core conftest.err conftest.$ac_obj
+ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sparc_v8plus" >&5
+ printf "%s\n" "$gl_cv_sparc_v8plus" >&6; }
+-        if test $gl_cv_sparc_v8plus = no; then
++        if test $gl_cv_sparc_v8plus != no; then
+                               CC="$CC -mcpu=v9"
+           CXX="$CXX -mcpu=v9"
+         fi
Index: pkgsrc/devel/m4/patches/patch-m4_sparcv8+.m4
diff -u /dev/null pkgsrc/devel/m4/patches/patch-m4_sparcv8+.m4:1.1
--- /dev/null	Mon Nov 15 13:20:04 2021
+++ pkgsrc/devel/m4/patches/patch-m4_sparcv8+.m4	Mon Nov 15 13:20:04 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-m4_sparcv8+.m4,v 1.1 2021/11/15 13:20:04 nia Exp $
+
+pkg/56498: "devel/m4" build fails on netbsd-9/sparc
+
+--- m4/sparcv8+.m4.orig	2021-04-22 20:28:47.000000000 +0000
++++ m4/sparcv8+.m4
+@@ -30,7 +30,7 @@ AC_DEFUN([gl_SPARC_V8PLUS],
+              [gl_cv_sparc_v8plus=yes],
+              [gl_cv_sparc_v8plus=no])
+           ])
+-        if test $gl_cv_sparc_v8plus = no; then
++        if test $gl_cv_sparc_v8plus != no; then
+           dnl Strangely enough, '-mv8plus' does not have the desired effect.
+           dnl But '-mcpu=v9' does.
+           CC="$CC -mcpu=v9"


--_----------=_163698240424980--