From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 1DCFA3858C62 for ; Sun, 6 Nov 2022 18:04:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1DCFA3858C62 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org From: "Andreas K. Huettel" To: libc-stable@sourceware.org Subject: please backport "Makerules: fix MAKEFLAGS assignment for upcoming make-4.4 [BZ# 29564]" Date: Sun, 06 Nov 2022 19:04:13 +0100 Message-ID: <5616448.DvuYhMxLoT@pinacolada> Organization: Gentoo Linux MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart5873488.lOV4Wx5bFT"; micalg="pgp-sha512"; protocol="application/pgp-signature" X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --nextPart5873488.lOV4Wx5bFT Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="iso-8859-1"; protected-headers="v1" From: "Andreas K. Huettel" To: libc-stable@sourceware.org Date: Sun, 06 Nov 2022 19:04:13 +0100 Message-ID: <5616448.DvuYhMxLoT@pinacolada> Organization: Gentoo Linux MIME-Version: 1.0 Now that make-4.4 has been released, it would probably be a good idea to ba= ckport this commit from master to the release branches as well... I don't have the= perms but if someone else could do it... (We're already using it in Gentoo.) Thanks. commit 2d7ed98add14f75041499ac189696c9bd3d757fe Author: Sergei Trofimovich AuthorDate: Tue Sep 13 13:39:13 2022 -0400 Commit: Siddhesh Poyarekar CommitDate: Tue Sep 13 13:45:32 2022 -0400 Makerules: fix MAKEFLAGS assignment for upcoming make-4.4 [BZ# 29564] =20 make-4.4 will add long flags to MAKEFLAGS variable: =20 * WARNING: Backward-incompatibility! Previously only simple (one-letter) options were added to the MAK= EFLAGS variable that was visible while parsing makefiles. Now, all opti= ons are available in MAKEFLAGS. =20 This causes locale builds to fail when long options are used: =20 $ make --shuffle ... make -C localedata install-locales make: invalid shuffle mode: '1662724426r' =20 The change fixes it by passing eash option via whitespace and dashes. That way option is appended to both single-word form and whitespace separated form. =20 While at it fixed --silent mode detection in $(MAKEFLAGS) by filtering out --long-options. Otherwise options like --shuffle flag enable silent mode unintentionally. $(silent-make) variable consolidates the checks. =20 Resolves: BZ# 29564 =20 CC: Paul Smith CC: Siddhesh Poyarekar Signed-off-by: Sergei Trofimovich Reviewed-by: Siddhesh Poyarekar Makeconfig | 18 +++++++++++++++++- Makerules | 4 ++-- elf/rtld-Rules | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) =2D-=20 Andreas K. H=FCttel dilfridge@gentoo.org Gentoo Linux developer (council, toolchain, base-system, perl, libreoffice) --nextPart5873488.lOV4Wx5bFT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQKTBAABCgB9FiEE/Rnm0xsZLuTcY+rT3CsWIV7VQSoFAmNn9x1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEZE MTlFNkQzMUIxOTJFRTREQzYzRUFEM0RDMkIxNjIxNUVENTQxMkEACgkQ3CsWIV7V QSp9Tg//aPmnGOsQZS74/315JKPYet3adZhSAcovct0n1xYKU4QE8t5UPGkCGqjq pxZj6X0QTnynyhodiDKSOgB+HyGxU2QWRUbDe98/6ilaDOVKnLayy0/ujUTA1pvJ 9o185XgL/57isGquhKBitH9outrOHU6pb+YQaY+9dBYw5a9OiK+YjrIXJulOYDHG gX8SDb/TAyyv2n/FMcRhBJLt4HXmoMOThjA1OVCGTFTAYeYE4f22lBtsVn+qSznH 2hOaoz5PumSmxQMWOrqR9l/hSVockoEQo2czvpoXcLmqUphZ6cE7M3BrH6hF+5+M 27TpJZKQZsK46S8baL5vG5xuD7FEQwpRhS++PmFOzJt20469SrwT6nvWMdhb67Lw ttimai5PWivlH7W0jDphS+vHVS0Idg9bPJC5kriJGCn4R/c+4AGEyd27f94Fmuy3 gDMUcDArgPppYi9jqIuOUa5DMIMyKWEqzMs0P5w+kkvkqmkNZOryS2VhydGP4Oo5 Kt7aimQXc2/MHEFTQmpmN+IHX4Mivu427UW6d2qFRaZySx9jj8joGSvG50VXaKqv MUFKdMdapt7rcdWKNJHtuZoLOJ76k1OD1pvt5pEEtTI71ekVd1TtppZU8RxPmP4t IhU+uTTaoFTJJxQHypjk8N5iBriMwPYy6EswebDw/zbs8MB5lv8= =y2r1 -----END PGP SIGNATURE----- --nextPart5873488.lOV4Wx5bFT--