From patchwork Sat Feb 27 19:43:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 1445202 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=RfyN6iyA; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DnxmC3178z9sCD for ; Sun, 28 Feb 2021 06:43:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 97964434D4; Sat, 27 Feb 2021 19:43:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tNMg1x0IFQz7; Sat, 27 Feb 2021 19:43:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id D404B434C9; Sat, 27 Feb 2021 19:43:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 0A4181BF31C for ; Sat, 27 Feb 2021 19:43:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 008AE6F58F for ; Sat, 27 Feb 2021 19:43:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1AUlAA8mx4ku for ; Sat, 27 Feb 2021 19:43:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) by smtp3.osuosl.org (Postfix) with ESMTPS id 85F626F556 for ; Sat, 27 Feb 2021 19:43:46 +0000 (UTC) Received: by mail-il1-f178.google.com with SMTP id i18so11122200ilq.13 for ; Sat, 27 Feb 2021 11:43:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PXhMVZbfytPwC8syP2mgJXTOHSPZ6fUAkndtH+8h1xQ=; b=RfyN6iyA+UmGrdHCCfIEbvl+ILnG4YGZ8DaaN8ZhnVBgT2s19PBW5K4vtoVq1SCruT s45bRaxEPzwUxQv9nSjQdNR4bCXifRVeQ+1xFyIoOCcYCnp98G5ddi9RC113GnEgbHym N41sJHLeXzMMpoRNZxPbwGF2nIhfVTNLE/cJipIe15Hv+eDDoBp6HLJKo9DnL+oFMe1c 1wVz3EbvGllIOO//DQmltbjaYbROqa6ZuiwrfR+SgRJu8B9H2HqdIksyR/kPAexLxBqY M31yMVvS9Iax9neOQtDnfyufBFFaIdIdqMVOTjhj3B/iMIHTncVgp1Yd63aORLlrv8f1 pDsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PXhMVZbfytPwC8syP2mgJXTOHSPZ6fUAkndtH+8h1xQ=; b=PVdvPq+EY5PSpkCQOPh1i+qDgZeZgMsNWa3jVLH3CYZFX737LdLOQXvHVkfzKDD6hQ 86lTLkGvsh+IMGMVCRXMRpwRPzC3/px+BwvQyF6Zvnne2N+oFOmodkaZ1Kdog+A1nGT+ bFcZ+BbUn4/mAxQxnRea1tf56FlAfKLgEZGkr+9Kc3RuTXu4k6d4kc3pWKrKbzxCZa4P PiPeBjAV5+e5qDqhGSrqY92xMd6vzUWSpeUIwU37RrrkblFePvoPESGyCDI0Az9aCe6F ZV2Qy7U7tWkYXgtvvDR19DwKbjqlWnXs3KtVzMNO2gdD7StAnaEOuD+v0MCjvFIP/KYr EJPw== X-Gm-Message-State: AOAM533hId24gp8+2JenrjZNZRBjBubIpmAYUx9oz5ZNE2niwHy4IZ68 n3938BzxWf4R1jwTdz4lNE1jt67Rn0IzSlG6 X-Google-Smtp-Source: ABdhPJzU9L8fCX/inA6iJNbzSK6F8/NsAJLK6J+J8GbM8pqBhYGlpPIzY59E6HDrZYh6a+kCXhyxug== X-Received: by 2002:a92:3f06:: with SMTP id m6mr7125649ila.283.1614455025421; Sat, 27 Feb 2021 11:43:45 -0800 (PST) Received: from ryan-pc.birdiebarn.net (50-82-176-206.client.mchsi.com. [50.82.176.206]) by smtp.gmail.com with ESMTPSA id w6sm6640814ilm.38.2021.02.27.11.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Feb 2021 11:43:44 -0800 (PST) From: Ryan Barnett To: buildroot@buildroot.org Date: Sat, 27 Feb 2021 13:43:38 -0600 Message-Id: <20210227194338.54649-1-ryanbarnett3@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2020.02.x] package/fakeroot: fix glibc detection on patch for new wrappers X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Commit f45925a951318e9e53bead80b363e004301adc6f add the patch: 0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch which allowed fakeroot to be compiled with GLIBC 2.33 or above. However, this introduce a bug for building with a non-GLIBC based toolchain as a GLIBC macro - __GLIBC_PREREQ - is used on the same line as the detection of GLIBC. Fix this by backporting the fix to this incorrect macro from upstream commit: https://salsa.debian.org/clint/fakeroot/-/commit/8090dffdad8fda86dccd47ce7a7db8840bdf7d7b CC: Peter Korsgaard Signed-off-by: Ryan Barnett --- Backport to: 2020.02.x from commit e41b170b328cc086334948ff3b8038075e2c09ce --- .../0008-fix-build-regression-on-macOS.patch | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/fakeroot/0008-fix-build-regression-on-macOS.patch diff --git a/package/fakeroot/0008-fix-build-regression-on-macOS.patch b/package/fakeroot/0008-fix-build-regression-on-macOS.patch new file mode 100644 index 0000000000..9ed0d8dc49 --- /dev/null +++ b/package/fakeroot/0008-fix-build-regression-on-macOS.patch @@ -0,0 +1,63 @@ +From dc910b81378b5fb8b4e851d5deb9755e6969dad5 Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Mon, 15 Feb 2021 11:07:56 -0800 +Subject: [PATCH 8/8] fix build regression on macOS + +Signed-off-by: Felix Fietkau +Signed-off-by: Ilya Lipnitskiy +[Ryan: backported from 8090dffdad8fda86dccd47ce7a7db8840bdf7d7b] +Signed-off-by: Ryan Barnett +--- + configure.ac | 6 ++++++ + libfakeroot.c | 4 +++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 71f90ff..0ad1da0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -181,6 +181,9 @@ AC_MSG_CHECKING([for type of arg of __xmknod]) + #include + #include + ]], [[ ++#ifndef __GLIBC__ ++#error no extra * ++#endif + int __xmknod ( int ver, + const char *pathname , + mode_t mode , dev_t *dev); +@@ -207,6 +210,9 @@ AC_MSG_CHECKING([for type of arg of __xmknodat]) + #include + #include + ]], [[ ++#ifndef __GLIBC__ ++#error no extra * ++#endif + int __xmknodat ( int ver, + int dirfd, + const char *pathname , +diff --git a/libfakeroot.c b/libfakeroot.c +index 3eedd99..6e49618 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -1351,7 +1351,8 @@ int renameat(int olddir_fd, const char *oldpath, + #endif /* HAVE_FSTATAT */ + + +-#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33) ++#if defined(__GLIBC__) ++#if __GLIBC_PREREQ(2,33) + /* Glibc 2.33 exports symbols for these functions in the shared lib */ + int lstat(const char *file_name, struct stat *statbuf) { + return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf); +@@ -1396,6 +1397,7 @@ int renameat(int olddir_fd, const char *oldpath, + return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev); + } + #endif ++#endif /* __GLIBC__ */ + #endif /* GLIBC_PREREQ */ + + +-- +2.25.1 +