From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D8C8E15800F for ; Thu, 5 Jan 2023 05:21:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CC9DE0831; Thu, 5 Jan 2023 05:21:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA5CDE0831 for ; Thu, 5 Jan 2023 05:21:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C0B6340EF8 for ; Thu, 5 Jan 2023 05:21:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BD48803 for ; Thu, 5 Jan 2023 05:21:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672895719.7295d49098b11229f6c79cfd9842bd6da11e6ad6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libbpf/libbpf-0.8.1.ebuild dev-libs/libbpf/libbpf-1.0.0-r1.ebuild dev-libs/libbpf/libbpf-1.0.1.ebuild dev-libs/libbpf/libbpf-9999.ebuild X-VCS-Directories: dev-libs/libbpf/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7295d49098b11229f6c79cfd9842bd6da11e6ad6 X-VCS-Branch: master Date: Thu, 5 Jan 2023 05:21:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e1df28d9-ae46-4a52-9c09-157422a6dce6 X-Archives-Hash: d1daa77b8e32c49b9f5845a8009b4fef commit: 7295d49098b11229f6c79cfd9842bd6da11e6ad6 Author: YiFei Zhu google com> AuthorDate: Thu Jan 5 04:08:13 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 5 05:15:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7295d490 dev-libs/libbpf: Fix install in cross-compilation Without this patch install would cause: * Bad lib64 usage detected: drwxr-xr-x 3 root root 4.0K Jan 4 06:31 /build/target/tmp/portage/dev-libs/libbpf-1.0.1/image/usr/lib64 lrwxrwxrwx 1 root root 11 Jan 4 06:31 /build/target/tmp/portage/dev-libs/libbpf-1.0.1/image/usr/lib64/libbpf.so -> libbpf.so.1 lrwxrwxrwx 1 root root 15 Jan 4 06:31 /build/target/tmp/portage/dev-libs/libbpf-1.0.1/image/usr/lib64/libbpf.so.1 -> libbpf.so.1.0.1 -rwxr-xr-x 1 root root 889K Jan 4 06:31 /build/target/tmp/portage/dev-libs/libbpf-1.0.1/image/usr/lib64/libbpf.so.1.0.1 drwxr-xr-x 2 root root 4.0K Jan 4 06:31 /build/target/tmp/portage/dev-libs/libbpf-1.0.1/image/usr/lib64/pkgconfig -rw-r--r-- 1 root root 294 Jan 4 06:31 /build/target/tmp/portage/dev-libs/libbpf-1.0.1/image/usr/lib64/pkgconfig/libbpf.pc * This arch (arm) should never use 'lib64'. PR #28323 commit bd8d3b7a7f3d (dev-libs/libbpf: Fix install in prefix") removed declaration of LIBDIR because it is default-initialized to: LIBDIR ?= $(PREFIX)/$(LIBSUBDIR) However this causes regression because while we do set: export LIBSUBDIR="$(get_libdir)" This does not take effect in the Makefile, because it does either one of: LIBSUBDIR := lib64 LIBSUBDIR := lib Environment variables don't take precedence over variables from makefiles unless -e is given. To minimize other possible regressions I'm explicitly whitelisting LIBSUBDIR for precedence over that from makefile. Reported-by: Aashay Shringarpure google.com> Signed-off-by: YiFei Zhu google.com> Closes: https://github.com/gentoo/gentoo/pull/28962 Signed-off-by: Sam James gentoo.org> dev-libs/libbpf/libbpf-0.8.1.ebuild | 1 + dev-libs/libbpf/libbpf-1.0.0-r1.ebuild | 1 + dev-libs/libbpf/libbpf-1.0.1.ebuild | 1 + dev-libs/libbpf/libbpf-9999.ebuild | 1 + 4 files changed, 4 insertions(+) diff --git a/dev-libs/libbpf/libbpf-0.8.1.ebuild b/dev-libs/libbpf/libbpf-0.8.1.ebuild index 9050c1e4a1be..ca787e88d5fe 100644 --- a/dev-libs/libbpf/libbpf-0.8.1.ebuild +++ b/dev-libs/libbpf/libbpf-0.8.1.ebuild @@ -42,6 +42,7 @@ src_configure() { src_install() { emake \ DESTDIR="${D}" \ + LIBSUBDIR="${LIBSUBDIR}" \ install install_uapi_headers if ! use static-libs; then diff --git a/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild b/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild index d930f5e22209..a3309d26fe8d 100644 --- a/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild +++ b/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild @@ -41,6 +41,7 @@ src_configure() { src_install() { emake \ DESTDIR="${D}" \ + LIBSUBDIR="${LIBSUBDIR}" \ install install_uapi_headers if ! use static-libs; then diff --git a/dev-libs/libbpf/libbpf-1.0.1.ebuild b/dev-libs/libbpf/libbpf-1.0.1.ebuild index 1092fcc0f3c4..4bc4f9eafffd 100644 --- a/dev-libs/libbpf/libbpf-1.0.1.ebuild +++ b/dev-libs/libbpf/libbpf-1.0.1.ebuild @@ -42,6 +42,7 @@ src_configure() { src_install() { emake \ DESTDIR="${D}" \ + LIBSUBDIR="${LIBSUBDIR}" \ install install_uapi_headers if ! use static-libs; then diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild index 1092fcc0f3c4..4bc4f9eafffd 100644 --- a/dev-libs/libbpf/libbpf-9999.ebuild +++ b/dev-libs/libbpf/libbpf-9999.ebuild @@ -42,6 +42,7 @@ src_configure() { src_install() { emake \ DESTDIR="${D}" \ + LIBSUBDIR="${LIBSUBDIR}" \ install install_uapi_headers if ! use static-libs; then