From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gCZpBLBUUGDbJAAA0tVLHw (envelope-from ) for ; Tue, 16 Mar 2021 06:48:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id kEUvALBUUGCXXwAA1q6Kng (envelope-from ) for ; Tue, 16 Mar 2021 06:48:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8B8941353E for ; Tue, 16 Mar 2021 07:48:15 +0100 (CET) Received: from localhost ([::1]:54842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3V0-0003Bx-Ml for larch@yhetil.org; Tue, 16 Mar 2021 02:48:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Uq-00037Q-JK for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Uq-0005Ym-9z for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Uq-0001fb-7x for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 04/18] gnu: glibc: Fix ldd path on powerpc*. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Leo Le Bouter , Chris Marusich , Efraim Flashner Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772376246 (code B ref 47182); Tue, 16 Mar 2021 06:48:04 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:17 +0000 Received: from localhost ([127.0.0.1]:37908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3U0-0001cL-Bv for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:17 -0400 Received: from mail-pj1-f48.google.com ([209.85.216.48]:40866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tn-0001ZO-Pf for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:04 -0400 Received: by mail-pj1-f48.google.com with SMTP id a22-20020a17090aa516b02900c1215e9b33so836892pjq.5 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:46:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hRipn9KqMffAGZPY8Nkxxqlg+Mq857NdsZhMGxvsdPA=; b=SDasqROyKa0JB5cmSuTYYjoN/27hwGw8GQStIHpOHWLYMVIJWlrFHHDjWn5FKG8nDP zp4KFVocHrXATjDLlagXw+NMWWAaYe/4uUzC6h3L3C7TiOBC9gGd9YZEV4keVsYjE7sO uZwPcZ3gEVdySTSgiW6jKzG88IAMuIghUQoLq4UFcGy8Oav7Kx8+dRTgDuo7hZkoKXaO IEdwY6Hg2JPxdFJb4CocSSie5Mged9hFviMr0Cwv9kCc677Kelg1TsKFI5KIIaezomv3 Uv1lzF/Ufr3CzuJbR/H4HzPL2NYZNE82+AazKYtrwUFl06frfDs4JItEpmMzE+2+o1pF E5eA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=hRipn9KqMffAGZPY8Nkxxqlg+Mq857NdsZhMGxvsdPA=; b=TP4c/dL+ENOW8rstiLg3hYTMeXBvGG8MZQdDbs99nlYPhmvQPNeYrOLSoVaSH31zNJ 4LPcacGq2+flL/k9bgDnucnD+4krlO76RN4cYoOyRdBFGxnw2Tx8ln3FfNfKcon0+FEc lQ+JxhCb+pYpilnZfEc4HhyBDtt7oqE8HEVhUxeTlwtQub4rdqlifXGv0f/dqYx8NbR0 3nI3mDjl1cv2UK5sM6fGLmBpXVsRqV2lCN8bdJHuedkdBYziB7Cyht93Qc28VOzalE0G NhyFf4Gd7iS7OxNHIgO2fp8ZNPWrupX22fYqFXc05gYNUL+3Yiez0nrnC7fX6PApeiAx Recg== X-Gm-Message-State: AOAM5322Ui8isQErPFwmKbg6jgbiwg2zSetguYL1yNvSN2yD9H0NaPPi YsgqXj2rvyKQa1mqe0tBmr6/oaKjqSv7jw== X-Google-Smtp-Source: ABdhPJwGk5/sqXfXxum/yc95ougy45WGt1tG6lUitSVJPvNmIF8gccdEkshrOqKCHcKzFTHMDOYCPA== X-Received: by 2002:a17:90a:e64a:: with SMTP id ep10mr3374380pjb.105.1615877213726; Mon, 15 Mar 2021 23:46:53 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:53 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:44:57 -0700 Message-Id: <20210316064511.2891553-4-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615877295; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=hRipn9KqMffAGZPY8Nkxxqlg+Mq857NdsZhMGxvsdPA=; b=ImcfR1nCnCG71EFY8j0+/YG2A4DltP1zUEMUmqiYBkANRPU24qH+6jbaYOMSikFLrLHwcL QQ0Wl9Wj+DLp6D7UrpCZ6/OIfu88EAryjHg3bkQQeA0S1tq2/QKTfQoJJjxc1jirCV+yl/ mbEks+aaKdf44akNTFKtG3YITCcd/dMZ+4lQHM5kzFe2zMYGVM9/iVdBQnxz4rBLwA4fZI xvKY2/LDN604tZXsF5kFTXPfDhiKX9Yx6DLetqK5Gi9cSDuPE6PX1EMHGwHUzGKJyq4l+0 bpwt9HW8Tt93KPvl+dLKjTymINkT6Lf/doEH+onsxsojhLuDS/s7RSPUISHizA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615877295; a=rsa-sha256; cv=none; b=RtSXxYffML69+ojOa2clc2dtVGRM7Dx9G39R5md3gjS2vQ0IdFPS5tVOWUSHJEaeo3dA9L dxIaYGQfJzZ5z8HFl5yUZjhJhkQ7/FUKxTYptG+uEanPat5AQc2cNn5JDuG3zJQxLI92dE cIBr+Vgb563eqOSyLhBkJUbVZIfJYDbApCcBWcOEuaY6eINspdzJiC7rlBjzu6/4NMnEHx U15OHwMlGxv4lGPHL0JEgBzxiZ74KeSrl69Z8oXaNao/avolj2dE95t2zkNj8FCx1asAv2 nlpQfbQDtCslYZ6jy7QhmNmmGOAvbwAf12CqXE6nlPgZhz4XbIFjAuxx5jtxlw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=SDasqROy; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=SDasqROy; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8B8941353E X-Spam-Score: -0.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: Wf2QJ+Y33t2n From: Leo Le Bouter This should avoid some problems, such as "not a dynamic executable" errors. * gnu/packages/patches/glibc-ldd-powerpc.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm: (glibc)[native-inputs]: Add it. [arguments]: When building for powerpc* apply it. * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash, glibc-final)[native-inputs]: Add patch conditionally. This patch has been adjusted to apply to master. Signed-off-by: Chris Marusich Signed-off-by: Efraim Flashner --- gnu/local.mk | 1 + gnu/packages/base.scm | 16 +++++++++++++++- gnu/packages/commencement.scm | 10 +++++++++- gnu/packages/patches/glibc-ldd-powerpc.patch | 10 ++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/glibc-ldd-powerpc.patch diff --git a/gnu/local.mk b/gnu/local.mk index cf8849cf598..4bd333e56f2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1120,6 +1120,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-mach-print.patch \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ + %D%/packages/patches/glibc-ldd-powerpc.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ %D%/packages/patches/glibc-locales-2.28.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9aa69cfe773..7c5ac61f01c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis -;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2016, 2018 Alex Vong ;;; Copyright © 2017 Rene Saavedra @@ -15,6 +15,8 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2020 Vitaliy Shatrov +;;; Copyright © 2020 Chris Marusich +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -890,6 +892,14 @@ the store.") files))) #t))) + ,@(if (target-powerpc?) + '((add-after 'unpack 'apply-patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs + "powerpc64le-patch"))) + (invoke "patch" "--force" "-p1" + "-i" patch))))) + '()) ,@(if (hurd-target?) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) @@ -911,6 +921,10 @@ the store.") ("gettext" ,gettext-minimal) ("python" ,python-minimal) + ,@(if (target-powerpc?) + `(("powerpc64le-patch" ,@(search-patches + "glibc-ldd-powerpc.patch"))) + '()) ,@(if (hurd-target?) `(("mig" ,mig) ("perl" ,perl)) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 432910d7a30..93b0c508822 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3313,7 +3313,11 @@ memoized as a function of '%current-system'." `(("bison" ,bison-boot0) ("texinfo" ,texinfo-boot0) ("perl" ,perl-boot0) - ("python" ,python-boot0))) + ("python" ,python-boot0) + ,@(if (target-powerpc?) + `(("powerpc64le-patch" ,@(search-patches + "glibc-ldd-powerpc.patch"))) + '()))) (inputs `( ;; The boot inputs. That includes the bootstrap libc. We don't want ;; it in $CPATH, hence the 'pre-configure' phase above. @@ -3464,6 +3468,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; This time we need 'msgfmt' to install all the libc.mo files. (native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash) + ,@(if (target-powerpc?) + `(("powerpc64le-patch" ,@(search-patches + "glibc-ldd-powerpc.patch"))) + '()) ("gettext" ,gettext-boot0))) (propagated-inputs diff --git a/gnu/packages/patches/glibc-ldd-powerpc.patch b/gnu/packages/patches/glibc-ldd-powerpc.patch new file mode 100644 index 00000000000..8e899ee99b8 --- /dev/null +++ b/gnu/packages/patches/glibc-ldd-powerpc.patch @@ -0,0 +1,10 @@ +diff -r -U3 a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed +--- a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed 1970-01-01 01:00:00.000000000 +0100 ++++ b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed 2020-02-29 00:15:41.080000000 +0100 +@@ -11,5 +11,5 @@ + # this works for /lib64/ld64.so.x and /lib/ld.so.x as input + s_lib64_lib_ + s_64\.so_\.so_ +-s_^RTLDLIST=\(.*lib\)\(/[^/]*\)\(\.so\.[0-9.]*\)[[:blank:]]*$_RTLDLIST="\1\2\3 \164\264\3"_ ++s_^RTLDLIST=\(.*lib\)\(/[^/]*\)\(\.so\.[0-9.]*\)[[:blank:]]*$_RTLDLIST="\1\2\3 \1\264\3"_ + -- 2.26.2