NetBSD Problem Report #58104
From www@netbsd.org Tue Apr 2 16:02:16 2024
Return-Path: <www@netbsd.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
by mollari.NetBSD.org (Postfix) with ESMTPS id 12E891A9239
for <gnats-bugs@gnats.NetBSD.org>; Tue, 2 Apr 2024 16:02:16 +0000 (UTC)
Message-Id: <20240402160144.728C01A923B@mollari.NetBSD.org>
Date: Tue, 2 Apr 2024 16:01:44 +0000 (UTC)
From: hashikaw@mail.ru
Reply-To: hashikaw@mail.ru
To: gnats-bugs@NetBSD.org
Subject: When building x11, awk (not ${TOOL_AWK}) is used for PACKAGE_VERSION
X-Send-Pr-Version: www-1.0
>Number: 58104
>Category: xsrc
>Synopsis: When building x11, awk (not ${TOOL_AWK}) is used for PACKAGE_VERSION
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: xsrc-manager
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Tue Apr 02 16:05:00 +0000 2024
>Closed-Date: Wed Apr 17 19:20:29 +0000 2024
>Last-Modified: Wed Apr 17 19:20:29 +0000 2024
>Originator: Kouichi Hashikawa
>Release: NetBSD-current, 10
>Organization:
>Environment:
>Description:
When I building 10-release for PPC405 on PPC405, bsd.x11.mk uses platform's awk (on PPC405 awk sometimes dumps core...) not ${TOOL_AWK}.
If I uses ${TOOL_AWK}, more stable (I don't know the reason...).
obj ===> external/mit/xorg/bin/twm
awk: floating point exception: Invalid Floating point operation
input record number 6141, file /usr/xsrc/external/mit/twm/dist/configure
source line number 1
nbmake[5]: "/usr/src/external/mit/xorg/bin/twm/Makefile" line 62: warning: "awk '/^PACKAGE_VERSION=/ { match($1, "([0-9]+\\.)+[0-9]+"); version = substr($1, RSTART, RLENGTH); } END { print version }' /usr/xsrc/external/mit/twm/dist/configure" returned non-zero status
>How-To-Repeat:
sometimes.
>Fix:
--- src/share/mk/bsd.x11.mk-dist 2023-12-03 23:21:35.911362364 +0900
+++ src/share/mk/bsd.x11.mk 2024-04-03 00:53:24.927565916 +0900
@@ -145,7 +145,7 @@
XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
-PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
+PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
match($$1, "([0-9]+\\.)+[0-9]+"); \
version = substr($$1, RSTART, RLENGTH); \
} END { print version }'
>Release-Note:
>Audit-Trail:
From: "Christos Zoulas" <christos@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/58104 CVS commit: src/share/mk
Date: Tue, 2 Apr 2024 12:17:29 -0400
Module Name: src
Committed By: christos
Date: Tue Apr 2 16:17:29 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk bsd.x11.mk
Log Message:
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
To generate a diff of this commit:
cvs rdiff -u -r1.397 -r1.398 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.151 -r1.152 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->needs-pullups
State-Changed-By: riastradh@NetBSD.org
State-Changed-When: Tue, 02 Apr 2024 16:33:38 +0000
State-Changed-Why:
probably needs pullups to 10, 9, 8
From: Thomas Klausner <wiz@NetBSD.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: xsrc/58104 (When building x11, awk (not ${TOOL_AWK}) is used for
PACKAGE_VERSION)
Date: Wed, 3 Apr 2024 00:12:46 +0200
On Tue, Apr 02, 2024 at 04:33:38PM +0000, Taylor R Campbell wrote:
> Synopsis: When building x11, awk (not ${TOOL_AWK}) is used for PACKAGE_VERSION
>
> State-Changed-From-To: open->needs-pullups
> State-Changed-By: riastradh@NetBSD.org
> State-Changed-When: Tue, 02 Apr 2024 16:33:38 +0000
> State-Changed-Why:
> probably needs pullups to 10, 9, 8
8 is EOL, so only 10, 9
From: Kouichi Hashikawa <hashikaw@mail.ru>
To: gnats-bugs@netbsd.org
Cc: xsrc-manager@netbsd.org, gnats-admin@netbsd.org, netbsd-bugs@netbsd.org
Subject: Re: xsrc/58104 (When building x11, awk (not ${TOOL_AWK}) is used for PACKAGE_VERSION)
Date: Wed, 3 Apr 2024 21:10:56 +0900
--Apple-Mail-564113F2-2506-49B1-9DA1-18E32EB8E76B
Content-Type: text/plain;
charset=utf-8
Content-Transfer-Encoding: quoted-printable
Thank you for applying the patch.
Please pull-up to release branch.
And, when ${TOOL_AWK} dumps core (but, less times than platform=E2=80=99s aw=
k), then I use ${TOOL_GREP} before ${TOOL_AWK} as following.
--- src/external/mit/xorg/xorg-pkg-ver.mk-110 2018-05-31 18:31:39.0000000=
00=20
+0900
+++ src/external/mit/xorg/xorg-pkg-ver.mk 2024-03-31 22:52:57.865845014 +=
0900
@@ -11,46 +11,50 @@
.if exists(${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure)
XORG_PKG_PACKAGE_VERSION!=3D \
+ ${TOOL_GREP} ^PACKAGE_VERSION=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/conf=
igure=20
| \
${TOOL_AWK} -F=3D '/^PACKAGE_VERSION=3D/ { \
match($$2, "([0-9]+\\.)+[0-9]+"); \
version =3D substr($$2, RSTART, RLENGTH); \
print version; \
exit 0; \
- }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
+ }'
.if !empty(XORG_PKG_PACKAGE_VERSION)
CPPFLAGS+=3D -DPACKAGE_VERSION=3D\"${XORG_PKG_PACKAGE_VERSION:Q}\"
CPPFLAGS+=3D -DVERSION=3D\"${XORG_PKG_PACKAGE_VERSION:q}\"
.endif
XORG_PKG_PACKAGE_STRING!=3D \
+ ${TOOL_GREP} ^PACKAGE_STRING=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/confi=
gure=20
| \
${TOOL_AWK} -F=3D '/^PACKAGE_STRING=3D/ { \
match($$2, "[-_a-zA-Z]+[ ]+([0-9]+\\.)+[0-9]+"); \
string =3D substr($$2, RSTART, RLENGTH); \
print string; \
exit 0; \
- }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
+ }'
.if !empty(XORG_PKG_PACKAGE_STRING)
CPPFLAGS+=3D -DPACKAGE_STRING=3D\"${XORG_PKG_PACKAGE_STRING:Q}\"
.endif
XORG_PKG_PACKAGE_NAME!=3D \
+ ${TOOL_GREP} ^PACKAGE_NAME=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configu=
re | \
${TOOL_AWK} -F=3D '/^PACKAGE_NAME=3D/ { \
match($$2, "[-_a-zA-Z0-9]+"); \
name =3D substr($$2, RSTART, RLENGTH); \
print name; \
exit 0; \
- }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
+ }'
.if !empty(XORG_PKG_PACKAGE_NAME)
CPPFLAGS+=3D -DPACKAGE_NAME=3D\"${XORG_PKG_PACKAGE_NAME:Q}\"
.endif
XORG_PKG_RELEASE_DATE!=3D \
+ ${TOOL_GREP} ^RELEASE_DATE=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configu=
re | \
${TOOL_AWK} -F=3D '/^RELEASE_DATE=3D/ { \
match($$2, "[-_a-zA-Z0-9]+"); \
name =3D substr($$2, RSTART, RLENGTH); \
print name; \
exit 0; \
- }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
+ }'
.if !empty(XORG_PKG_RELEASE_DATE)
CPPFLAGS+=3D -DRELEASE_DATE=3D\"${XORG_PKG_RELEASE_DATE:Q}\"
.endif
--- src/share/mk/bsd.x11.mk-114525 2023-12-01 12:32:41.555622511 +0900
+++ src/share/mk/bsd.x11.mk 2024-03-31 23:31:32.244541090 +0900
@@ -274,8 +274,9 @@
if [ -n '${PKGCONFIG_VERSION.${.PREFIX}}' ]; then \
_pkg_version=3D'${PKGCONFIG_VERSION.${.PREFIX}}'; \
else \
- _pkg_version=3D$$(${PRINT_PACKAGE_VERSION} \
- ${PKGDIST.${.PREFIX}}/configure); \
+ _pkg_version=3D$$(${TOOL_GREP} ^PACKAGE_VERSION=3D \
+ ${PKGDIST.${.PREFIX}}/configure | \
+ ${PRINT_PACKAGE_VERSION}); \
fi; \
${TOOL_SED} \
${PKGCONFIG_SED_FLAGS} \
--=20
Kouichi Hashikawa=
--Apple-Mail-564113F2-2506-49B1-9DA1-18E32EB8E76B
Content-Type: text/html;
charset=utf-8
Content-Transfer-Encoding: quoted-printable
<html><head><meta http-equiv=3D"content-type" content=3D"text/html; charset=3D=
utf-8"></head><body dir=3D"auto"><div><font color=3D"#000000"><span style=3D=
"caret-color: rgb(0, 0, 0); -webkit-text-size-adjust: auto;">Thank you for a=
pplying the patch.</span></font></div><div><font color=3D"#000000"><span sty=
le=3D"caret-color: rgb(0, 0, 0); -webkit-text-size-adjust: auto;">Please pul=
l-up to release branch.</span></font></div><div><font color=3D"#000000"><spa=
n style=3D"caret-color: rgb(0, 0, 0); -webkit-text-size-adjust: auto;"><br><=
/span></font></div><div><font color=3D"#000000"><span style=3D"caret-color: r=
gb(0, 0, 0); -webkit-text-size-adjust: auto;">And, when ${TOOL_AWK} dumps co=
re (but, less times than platform=E2=80=99s awk), then I use ${TOOL_GREP} be=
fore ${TOOL_AWK} as following.</span></font></div><span style=3D"-webkit-tex=
t-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><div><=
span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); col=
or: rgb(0, 0, 0);"><br></span></div><div><span style=3D"-webkit-text-size-ad=
just: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><br></span></di=
v>--- src/external/mit/xorg/xorg-pkg-ver.mk-110 2018-05-31 18:3=
1:39.000000000 </span><br style=3D"-webkit-text-size-adjust: auto; care=
t-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-siz=
e-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">+0900</span=
><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); col=
or: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-colo=
r: rgb(0, 0, 0); color: rgb(0, 0, 0);">+++ src/external/mit/xorg/xorg-pkg-ve=
r.mk 2024-03-31 22:52:57.865845014 +0900</span><br style=3D"-we=
bkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);=
"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
olor: rgb(0, 0, 0);">@@ -11,46 +11,50 @@</span><br style=3D"-webkit-text-siz=
e-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=
=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0,=
0, 0);"></span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rg=
b(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: a=
uto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">.if exists(${X11SRCDIR=
.${XORG_PKG_VER_PROG}}/configure)</span><br style=3D"-webkit-text-size-adjus=
t: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-we=
bkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);=
">XORG_PKG_PACKAGE_VERSION!=3D \</span><br style=3D"-webkit-text-size-adjust=
: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-web=
kit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"=
>+ ${TOOL_GREP} ^PACKAGE_VERSION=3D ${X11SRCDIR.${XORG_PKG_VER_=
PROG}}/configure </span><br style=3D"-webkit-text-size-adjust: auto; ca=
ret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-s=
ize-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">| &=
nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0=
, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto=
; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"> ${TOOL_AWK} -=
F=3D '/^PACKAGE_VERSION=3D/ { \</sp=
an><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
olor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-co=
lor: rgb(0, 0, 0); color: rgb(0, 0, 0);"> &nb=
sp;match($$2, "([0-9]+\\.)+[0-9]+"); &nbs=
p;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0=
, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; c=
aret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"> &n=
bsp; version =3D substr($$2, RSTART, RLENGTH); &nb=
sp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0=
, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; c=
aret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"> &n=
bsp; print version; &n=
bsp; \</span><br style=3D"-webkit-text-size-adjust: auto; caret=
-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size=
-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">  =
; exit 0; &=
nbsp; \</span><br style=3D"-webkit-text-si=
ze-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span styl=
e=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0=
, 0, 0);">- }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure</spa=
n><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); co=
lor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-col=
or: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ }'</span><br style=3D=
"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
); color: rgb(0, 0, 0);">.if !empty(XORG_PKG_PACKAGE_VERSION)</span><br styl=
e=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0=
, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0,=
0, 0); color: rgb(0, 0, 0);">CPPFLAGS+=3D -DPACKAGE_VERSION=3D=
\"${XORG_PKG_PACKAGE_VERSION:Q}\"</span><br style=3D"-webkit-text-size-adjus=
t: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-we=
bkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);=
">CPPFLAGS+=3D -DVERSION=3D\"${XORG_PKG_PACKAGE_VERSION:q}\"</s=
pan><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
olor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-co=
lor: rgb(0, 0, 0); color: rgb(0, 0, 0);">.endif</span><br style=3D"-webkit-t=
ext-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><spa=
n style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color:=
rgb(0, 0, 0);"></span><br style=3D"-webkit-text-size-adjust: auto; caret-co=
lor: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-ad=
just: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">XORG_PKG_PACKAG=
E_STRING!=3D \</span><br style=3D"-webkit-text-size-adjust: auto; caret-colo=
r: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adju=
st: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ ${=
TOOL_GREP} ^PACKAGE_STRING=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure&nb=
sp;</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0=
, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; c=
aret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">| \</span><br s=
tyle=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rg=
b(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb=
(0, 0, 0); color: rgb(0, 0, 0);"> ${TOOL_AWK} -F=3D '/^PACKAGE_S=
TRING=3D/ { \</span><br style=3D"-w=
ebkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0)=
;"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0);=
color: rgb(0, 0, 0);"> match($$2, "[-_=
a-zA-Z]+[ ]+([0-9]+\\.)+[0-9]+"); \</span><br styl=
e=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0=
, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0,=
0, 0); color: rgb(0, 0, 0);"> string =3D=
substr($$2, RSTART, RLENGTH); \</span><br style=3D=
"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
); color: rgb(0, 0, 0);"> print string;=
\</spa=
n><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); co=
lor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-col=
or: rgb(0, 0, 0); color: rgb(0, 0, 0);"> &nbs=
p;exit 0; &nb=
sp; \</span><br style=3D"-webkit-text-size-adjust: auto; caret-=
color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-=
adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">- &nbs=
p;}' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure</span><br style=3D"-webkit-=
text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><sp=
an style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color=
: rgb(0, 0, 0);">+ }'</span><br style=3D"-webkit-text-size-adju=
st: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-w=
ebkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0)=
;">.if !empty(XORG_PKG_PACKAGE_STRING)</span><br style=3D"-webkit-text-size-=
adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D=
"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
0);">CPPFLAGS+=3D -DPACKAGE_STRING=3D\"${XORG_PKG_PACKAGE_STRI=
NG:Q}\"</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(=
0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: aut=
o; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">.endif</span><br style=3D=
"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
); color: rgb(0, 0, 0);"></span><br style=3D"-webkit-text-size-adjust: auto;=
caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-tex=
t-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">XORG_P=
KG_PACKAGE_NAME!=3D \</span><br style=3D"-webkit-text-size-adjust: auto; car=
et-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-si=
ze-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ &=
nbsp;${TOOL_GREP} ^PACKAGE_NAME=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configu=
re | \</span><br style=3D"-webkit-text-size-adjust: auto; caret=
-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size=
-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">  =
;${TOOL_AWK} -F=3D '/^PACKAGE_NAME=3D/ { &=
nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0=
, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto=
; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">  =
; match($$2, "[-_a-zA-Z0-9]+");  =
; \</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rg=
b(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: a=
uto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"> &n=
bsp; name =3D substr($$2, RSTART, RLENGTH); &=
nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0=
, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto=
; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">  =
; print name; &n=
bsp; \</span><br style=3D"-webkit-text-size-adjust: auto; caret=
-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size=
-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">  =
; exit 0; &=
nbsp; \</span><br style=3D"-webkit-text-si=
ze-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span styl=
e=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0=
, 0, 0);">- }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure</spa=
n><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); co=
lor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-col=
or: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ }'</span><br style=3D=
"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
); color: rgb(0, 0, 0);">.if !empty(XORG_PKG_PACKAGE_NAME)</span><br style=3D=
"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
); color: rgb(0, 0, 0);">CPPFLAGS+=3D -DPACKAGE_NAME=3D\"${XORG=
_PKG_PACKAGE_NAME:Q}\"</span><br style=3D"-webkit-text-size-adjust: auto; ca=
ret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-s=
ize-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">.endif</s=
pan><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
olor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-co=
lor: rgb(0, 0, 0); color: rgb(0, 0, 0);"></span><br style=3D"-webkit-text-si=
ze-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span styl=
e=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0=
, 0, 0);">XORG_PKG_RELEASE_DATE!=3D \</span><br style=3D"-webkit-text-size-a=
djust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D=
"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
0);">+ ${TOOL_GREP} ^RELEASE_DATE=3D ${X11SRCDIR.${XORG_PKG_VE=
R_PROG}}/configure | \</span><br style=3D"-webkit-text-size-adj=
ust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-=
webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0=
);"> ${TOOL_AWK} -F=3D '/^RELEASE_DATE=3D/ {  =
; \</span><br style=3D"-webkit-text-size-adjust: auto; c=
aret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-=
size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"> &=
nbsp; match($$2, "[-_a-zA-Z0-9]+"); &n=
bsp; \</span><br style=3D"-webkit-text-size-adjust: auto=
; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-te=
xt-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"> =
; name =3D substr($$2, RSTART, RLENGTH); &nbs=
p; \</span><br style=3D"-webkit-text-size-adjust: auto; c=
aret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-=
size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"> &=
nbsp; print name; =
\</span><br style=3D"-webkit-text-size-ad=
just: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"=
-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0=
);"> exit 0;  =
; \</span><br style=3D=
"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
); color: rgb(0, 0, 0);">- }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}=
/configure</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: r=
gb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: a=
uto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ }'</spa=
n><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); co=
lor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-col=
or: rgb(0, 0, 0); color: rgb(0, 0, 0);">.if !empty(XORG_PKG_RELEASE_DATE)</s=
pan><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
olor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-co=
lor: rgb(0, 0, 0); color: rgb(0, 0, 0);">CPPFLAGS+=3D -DRELEASE=
_DATE=3D\"${XORG_PKG_RELEASE_DATE:Q}\"</span><br style=3D"-webkit-text-size-=
adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D=
"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
0);">.endif</span><br style=3D"-webkit-text-size-adjust: auto; caret-color:=
rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust=
: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">--- src/share/mk/bs=
d.x11.mk-114525 2023-12-01 12:32:41.555622511 +0900</span><br s=
tyle=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rg=
b(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb=
(0, 0, 0); color: rgb(0, 0, 0);">+++ src/share/mk/bsd.x11.mk 20=
24-03-31 23:31:32.244541090 +0900</span><br style=3D"-webkit-text-size-adjus=
t: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-we=
bkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);=
">@@ -274,8 +274,9 @@</span><br style=3D"-webkit-text-size-adjust: auto; car=
et-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-si=
ze-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"> &nb=
sp;if [ -n '${PKGCONFIG_VERSION.${.PREFIX}}' ]; then \</span><br style=3D"-w=
ebkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0)=
;"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0);=
color: rgb(0, 0, 0);"> _pkg_version=3D'${PKGCONFI=
G_VERSION.${.PREFIX}}'; \</span><br style=3D"-webkit-text-size-adjust: auto;=
caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-tex=
t-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"> =
else \</span><br style=3D"-webkit-text-size-adjust: auto; caret-color=
: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjus=
t: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">- &n=
bsp; _pkg_version=3D$$(${PRINT_PACKAGE_VERSION} \</span><br style=3D"-=
webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0=
);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0)=
; color: rgb(0, 0, 0);">- ${PK=
GDIST.${.PREFIX}}/configure); \</span><br style=3D"-webkit-text-size-adjust:=
auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webk=
it-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">=
+ _pkg_version=3D$$(${TOOL_GREP} ^PACKAGE_VERSION=
=3D \</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0,=
0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto;=
caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ &nb=
sp; ${PKGDIST.${.PREFIX}}/configure | \</span=
><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); col=
or: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-colo=
r: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ &=
nbsp; ${PRINT_PACKAGE_VERSION}); \</span><br style=3D"-web=
kit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"=
><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
olor: rgb(0, 0, 0);"> fi; \</span><br style=3D"-webkit-text-size=
-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D=
"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
0);"> ${TOOL_SED} \</span><br style=3D"-webkit-text-size-adjust=
: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-web=
kit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"=
> ${PKGCONFIG_SED_FLAGS} \</span><br><br><div dir=3D=
"ltr"><span style=3D"background-color: rgba(255, 255, 255, 0);">-- </sp=
an><div><span style=3D"background-color: rgba(255, 255, 255, 0);">Kouichi Ha=
shikawa</span></div></div></body></html>=
--Apple-Mail-564113F2-2506-49B1-9DA1-18E32EB8E76B--
From: Kouichi Hashikawa <hashikaw@mail.ru>
To: gnats-bugs@netbsd.org
Cc: xsrc-manager@netbsd.org, gnats-admin@netbsd.org, netbsd-bugs@netbsd.org
Subject: Re: xsrc/58104 (When building x11, awk (not ${TOOL_AWK}) is used for PACKAGE_VERSION)
Date: Wed, 3 Apr 2024 21:03:48 +0900
--=20
Kouichi Hashikawa
> 2024/04/03 7:15=E3=80=81Thomas Klausner <wiz@netbsd.org>=E3=81=AE=E3=83=A1=
=E3=83=BC=E3=83=AB:
>=20
> =EF=BB=BFThe following reply was made to PR xsrc/58104; it has been noted b=
y GNATS.
>=20
> From: Thomas Klausner <wiz@NetBSD.org>
> To: gnats-bugs@netbsd.org
> Cc:=20
> Subject: Re: xsrc/58104 (When building x11, awk (not ${TOOL_AWK}) is used f=
or
> PACKAGE_VERSION)
> Date: Wed, 3 Apr 2024 00:12:46 +0200
>=20
>> On Tue, Apr 02, 2024 at 04:33:38PM +0000, Taylor R Campbell wrote:
>> Synopsis: When building x11, awk (not ${TOOL_AWK}) is used for PACKAGE_VE=
RSION
>>=20
>> State-Changed-From-To: open->needs-pullups
>> State-Changed-By: riastradh@NetBSD.org
>> State-Changed-When: Tue, 02 Apr 2024 16:33:38 +0000
>> State-Changed-Why:
>> probably needs pullups to 10, 9, 8
>=20
> 8 is EOL, so only 10, 9
>=20
State-Changed-From-To: needs-pullups->pending-pullups
State-Changed-By: riastradh@NetBSD.org
State-Changed-When: Thu, 04 Apr 2024 18:56:54 +0000
State-Changed-Why:
pullup-10 #654
pullup-9 #1826
pullup-8 #1954
(8 is not EOL yet, will be next month)
From: "Martin Husemann" <martin@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/58104 CVS commit: [netbsd-10] src/share/mk
Date: Wed, 17 Apr 2024 18:02:23 +0000
Module Name: src
Committed By: martin
Date: Wed Apr 17 18:02:23 UTC 2024
Modified Files:
src/share/mk [netbsd-10]: bsd.x11.mk
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #654):
share/mk/bsd.lib.mk: revision 1.398
share/mk/bsd.lib.mk: revision 1.399
share/mk/bsd.x11.mk: revision 1.152
(via patch)
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.145.2.5 -r1.145.2.6 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
From: "Martin Husemann" <martin@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/58104 CVS commit: [netbsd-9] src/share/mk
Date: Wed, 17 Apr 2024 18:04:57 +0000
Module Name: src
Committed By: martin
Date: Wed Apr 17 18:04:57 UTC 2024
Modified Files:
src/share/mk [netbsd-9]: bsd.x11.mk
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1826):
share/mk/bsd.lib.mk: revision 1.398
share/mk/bsd.lib.mk: revision 1.399
share/mk/bsd.x11.mk: revision 1.152
(via patch)
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.132.2.2 -r1.132.2.3 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
From: "Martin Husemann" <martin@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/58104 CVS commit: [netbsd-8] src/share/mk
Date: Wed, 17 Apr 2024 18:07:54 +0000
Module Name: src
Committed By: martin
Date: Wed Apr 17 18:07:53 UTC 2024
Modified Files:
src/share/mk [netbsd-8]: bsd.x11.mk
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1954):
share/mk/bsd.lib.mk: revision 1.398
share/mk/bsd.lib.mk: revision 1.399
share/mk/bsd.x11.mk: revision 1.152
(via patch)
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.124.6.1 -r1.124.6.2 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: pending-pullups->closed
State-Changed-By: riastradh@NetBSD.org
State-Changed-When: Wed, 17 Apr 2024 19:20:29 +0000
State-Changed-Why:
fixed and pulled up to all active branches
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.47 2022/09/11 19:34:41 kim Exp $
$NetBSD: gnats_config.sh,v 1.9 2014/08/02 14:16:04 spz Exp $
Copyright © 1994-2024
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.
Home