From patchwork Sun Nov 13 13:19:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manolis Ragkousis X-Patchwork-Id: 17445 Received: (qmail 57546 invoked by uid 89); 13 Nov 2016 13:20:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.7 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1040 X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 13 Nov 2016 13:20:24 +0000 Received: from localhost ([::1]:33783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5uhq-0000oC-Rm for patchwork@sourceware.org; Sun, 13 Nov 2016 08:20:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5uhi-0000mx-6n for guix-devel@gnu.org; Sun, 13 Nov 2016 08:20:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c5uhh-00047O-Fi for guix-devel@gnu.org; Sun, 13 Nov 2016 08:20:14 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:36123) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c5uhh-000472-41; Sun, 13 Nov 2016 08:20:13 -0500 Received: by mail-wm0-x241.google.com with SMTP id m203so8208703wma.3; Sun, 13 Nov 2016 05:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=48urbP3zJQO+mQTBEWxHE5k/93mrQEnKsswVh1uTZec=; b=t5IFEbtMuecZ8AIdcxOWNuixP9Vxni+vqewD3LFixOsTUYv75VRyRhvTQp+Rv5Lhv8 v4ZN7njk3q2xb0/uL6XknnyEemOKnHkDuwlA7l1mYX6c4IMEtxDRPa5ZtCIBXRa82Efg B7OQNa+405XzuDDvlpL8Qqdwqd6YFX5YMUUI8rgJ9xnRrdTvgaw8ZgHiSdOv18JBsVjf M7A4Qp+GtSY3WEk532UgDvnVLFDcGzCpd/hi+u4+yni/9yAOhWtanpYRY4DSVEDJ5toQ hJKZmCPKXUYi4rU8N6kZ4JxGbSq6sy6EPchic5n9uvjFR5IixR4VrdTSFkLWwW+hk2++ t1lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=48urbP3zJQO+mQTBEWxHE5k/93mrQEnKsswVh1uTZec=; b=Rom1J7tXal1wvR6ZzqCJ6lwBD0UpOGjUdhjQ4zJgWRkkqW03xmWOY6Mlkh3G7THfJB SF4frAGd8wH0JPwcdtK1A04tS/bxw+oEjs02zU/bxSXUkTo8qftiBnEE9oT/GvE6zwRO A7blTyoJFOYUG+FM6/56WDeSyVrVx9i5eqV/a0jC+AUeie70Zq8aL19sV1EmS6hKIbZl vKxgF+l4Yo9Stq7kbJj1FOW4IUFYNdMUFrhgW/ClknWobvSVnWiaey8R3KSrvOayiZr7 vnpLVBUat4mbfZ7cXVNcaNrUX9uN+Jg++eVFIK7G8n/jhY5E1t27huZEd9j6w9UxjOUN uQ+g== X-Gm-Message-State: ABUngvdh8w3VCEPP4uPRUxxoQjHekfjSw0bXB0llsW6WNnIeGvzcoCEqtK0qqlIOsZcugQ== X-Received: by 10.194.25.130 with SMTP id c2mr15587130wjg.124.1479043211158; Sun, 13 Nov 2016 05:20:11 -0800 (PST) Received: from localhost.localdomain (ppp-2-86-226-108.home.otenet.gr. [2.86.226.108]) by smtp.gmail.com with ESMTPSA id ei2sm8380016wjd.47.2016.11.13.05.20.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Nov 2016 05:20:10 -0800 (PST) From: manolis837@gmail.com To: guix-devel@gnu.org Subject: [PATCH] gnu: glibc-hurd: Force mach/hurd/libpthread subdirs to build first. Date: Sun, 13 Nov 2016 15:19:46 +0200 Message-Id: <20161113131946.4185-2-manolis837@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161113131946.4185-1-manolis837@gmail.com> References: <20161113131946.4185-1-manolis837@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" From: Manolis Ragkousis * gnu/packages/base.scm (glibc/hurd): Avoid linking errors by forcing mach/hurd/libpthread glibc subdirs to build before anything else. --- gnu/packages/base.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1c01874..abefe4e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -714,7 +714,17 @@ with the Linux kernel.") ;; Use the right 'pwd'. (substitute* "configure" (("/bin/pwd") "pwd"))) - ,original-phases))) + (alist-replace + 'build + (lambda _ + ;; Force mach/hurd/libpthread subdirs to build first in order to avoid + ;; linking errors. + (zero? + (and (system* "make" "mach/subdir_lib") + (system* "make" "hurd/subdir_lib") + (system* "make" "libpthread/subdir_lib") + (system* "make")))) + ,original-phases)))) ((#:configure-flags original-configure-flags) `(append (list "--host=i586-pc-gnu"