From patchwork Sun Feb 21 18:38:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 1442862 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.138; helo=smtp1.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=uWgEDwhf; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 4DkDcY0R2nz9sCD for ; Mon, 22 Feb 2021 05:39:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BC48E835E0 for ; Sun, 21 Feb 2021 18:39:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G8yyMnsQu0TE for ; Sun, 21 Feb 2021 18:39:21 +0000 (UTC) Received: by smtp1.osuosl.org (Postfix, from userid 1001) id E7F67835ED; Sun, 21 Feb 2021 18:39:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 381F583380; Sun, 21 Feb 2021 18:39:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id DE0901BF399 for ; Sun, 21 Feb 2021 18:39:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D6BB58709D for ; Sun, 21 Feb 2021 18:39:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NUdAoJjoDkS4 for ; Sun, 21 Feb 2021 18:39:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9AE388708C for ; Sun, 21 Feb 2021 18:39:09 +0000 (UTC) Received: by mail-io1-f51.google.com with SMTP id u20so10956378iot.9 for ; Sun, 21 Feb 2021 10:39:09 -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=GxfSu141AfDrUx/6x292FNepdXY+Hp1VZsXykJBUL7A=; b=uWgEDwhfxgnY/0rUoumcr2HXDHOSg4eFE6XT5x6lznHU8u5RwasMx8grwMXG4BKH4O SlYw96MMDzrJK549TeRLY2hekqvUevx3iahHxmnX5JzI6Ppnnx9FfVDsuJ3VysHgBTOC MLU4DzH2FX8JcqJ3z/Cqy35Yy/lOfoUQRlZVyia37+YI2TBo1cQvt79M8if53JY9k2gd 7S1AuKUeyJxxEu0wGMaqDTP1yQzJaCYSoOlcYCHUQ/HVMQwDYpe+O6JKLUOyBTHAhMEw vfiuNTBQwOiJnq4XIHy0FiokllTFKdrkWE23c5cM4Vcm+wq4lQHkEya9iRAhR95X1i86 Mjqw== 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=GxfSu141AfDrUx/6x292FNepdXY+Hp1VZsXykJBUL7A=; b=sMVhJBcD5MjgYBec2jCIifFKmsfjPgJUMAkTLzZlsQfqglDtNEXyZVYdFhw7pX/l/Z jwAYOv3FEPwi5tsgBbgdOgmMq+UulLewoDKNIFYisd+aTnvTut2DUBX5VQHhxyETxHrF rlgQuxLRjmt0jctCd2TtI0UYqg3bY9vdQ/QNMU2F22fC0962KCpWziYbJsJ3BhVj0boV eCwEzPH+U6tLqkGcWSN5sXE/ieysKf7gEFwPYS3B/dD9n8ZjVThqYiIaK7N2qW673PYa JuhXX1/RGyJq7vsf2YqHqfCuscANyNZA7vsOhhZYRZ+MU7ewEumCQhws+0NI023AT0z1 EyZw== X-Gm-Message-State: AOAM5308uWjsVQQW14gneni4CIYV34M1ggokHlx6UnyzDmDI5QGXgCxc CFvue8elOr0lk6TW01IDsEIYzBjgu4ecKwfY X-Google-Smtp-Source: ABdhPJwwV54oaqXk4alJu0o7v9+eJk9IWisAtmKzUDknyzOcPMNZZbEQkZsT0CDMaEkjNAnozL3SSA== X-Received: by 2002:a05:6638:96:: with SMTP id v22mr1904226jao.128.1613932748608; Sun, 21 Feb 2021 10:39:08 -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 f11sm10296919ilc.69.2021.02.21.10.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 10:39:08 -0800 (PST) From: Ryan Barnett To: buildroot@buildroot.org Date: Sun, 21 Feb 2021 12:38:44 -0600 Message-Id: <20210221183844.845822-1-ryanbarnett3@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] 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 Signed-off-by: Ryan Barnett --- ...d-wrappers-for-new-glibc-2.33-symbol.patch | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch b/package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch index 8115598d64..fbbf16b4f4 100644 --- a/package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch +++ b/package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch @@ -1,4 +1,4 @@ -From feda578ca3608b7fc9a28a3a91293611c0ef47b7 Mon Sep 17 00:00:00 2001 +From 2c15ff6dda7ad3ea45590e262288569862fb3b90 Mon Sep 17 00:00:00 2001 From: Ilya Lipnitskiy Date: Thu, 11 Feb 2021 21:00:04 -0800 Subject: [PATCH] libfakeroot.c: add wrappers for new glibc 2.33+ symbols @@ -9,22 +9,29 @@ Content-Transfer-Encoding: 8bit This patch add wrappers for newly exported symbols in glibc 2.33. Backported from: feda578ca3608b7fc9a28a3a91293611c0ef47b7 +Backported from: 8090dffdad8fda86dccd47ce7a7db8840bdf7d7b Signed-off-by: Ilya Lipnitskiy Signed-off-by: Jörg Krause +Signed-off-by: Ryan Barnett --- - libfakeroot.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 48 insertions(+) +v1 -> v2 + - [ryan] incorporated fix to allow libfakeroot to compile on non + GLIBC hosts since __GLIBC_PREREQ macro is not defined +--- + libfakeroot.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 50 insertions(+) diff --git a/libfakeroot.c b/libfakeroot.c -index 14cdbc4..d75c51f 100644 +index 14cdbc4..ec4e577 100644 --- a/libfakeroot.c +++ b/libfakeroot.c -@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath, +@@ -1352,6 +1352,56 @@ 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); @@ -69,6 +76,7 @@ index 14cdbc4..d75c51f 100644 + return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev); + } + #endif ++#endif /* __GLIBC__ */ +#endif /* GLIBC_PREREQ */ + + @@ -76,5 +84,5 @@ index 14cdbc4..d75c51f 100644 pid_t fork(void) { -- -2.30.1 +2.25.1