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 2A5F61A9239 for ; Thu, 10 Feb 2022 21:22:47 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 6164F84D4C; Thu, 10 Feb 2022 21:22:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9A92B84D46 for ; Thu, 10 Feb 2022 21:22:45 +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 CwMZQLMYFN7b for ; Thu, 10 Feb 2022 21:22:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id F090884D44 for ; Thu, 10 Feb 2022 21:22:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E9CA7FB24; Thu, 10 Feb 2022 21:22:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_164452816463240" MIME-Version: 1.0 Date: Thu, 10 Feb 2022 21:22:44 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mk/platform To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20220210212244.E9CA7FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_164452816463240 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Thu Feb 10 21:22:44 UTC 2022 Modified Files: pkgsrc/mk/platform: Linux.mk Log Message: Fix GLIBC_VERSION detection on Manjaro ARM (so that devel/gettext-tools passes PLIST checks) and probably other Arch Linux too. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 pkgsrc/mk/platform/Linux.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_164452816463240 Content-Disposition: inline Content-Length: 909 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/platform/Linux.mk diff -u pkgsrc/mk/platform/Linux.mk:1.87 pkgsrc/mk/platform/Linux.mk:1.88 --- pkgsrc/mk/platform/Linux.mk:1.87 Sun Nov 14 14:47:11 2021 +++ pkgsrc/mk/platform/Linux.mk Thu Feb 10 21:22:44 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Linux.mk,v 1.87 2021/11/14 14:47:11 schmonz Exp $ +# $NetBSD: Linux.mk,v 1.88 2022/02/10 21:22:44 schmonz Exp $ # # Variable definitions for the Linux operating system. @@ -77,6 +77,9 @@ LIBABISUFFIX?= /powerpc64le-linux-gnu _OPSYS_SYSTEM_RPATH= /lib:/usr/lib:/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX} _OPSYS_LIB_DIRS?= /lib /usr/lib /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} . endif +.elif exists(/etc/arch-release) +_OPSYS_SYSTEM_RPATH= /lib:/usr/lib +_OPSYS_LIB_DIRS?= /lib /usr/lib .else _OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX} _OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} --_----------=_164452816463240--