From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Wingo Subject: [PATCH] Fix gettext linkage to expat Date: Sun, 05 Apr 2015 17:40:25 +0200 Message-ID: <871tjy4m8m.fsf@pobox.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yemf5-0000Qx-Bl for guix-devel@gnu.org; Sun, 05 Apr 2015 11:40:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yemf1-0003tU-4W for guix-devel@gnu.org; Sun, 05 Apr 2015 11:40:35 -0400 Received: from pb-sasl1.int.icgroup.com ([208.72.237.25]:51245 helo=sasl.smtp.pobox.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yemf0-0003tF-RS for guix-devel@gnu.org; Sun, 05 Apr 2015 11:40:31 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-sasl1.pobox.com (Postfix) with ESMTP id 0ECB942B06 for ; Sun, 5 Apr 2015 11:40:30 -0400 (EDT) Received: from pb-sasl1.int.icgroup.com (unknown [127.0.0.1]) by pb-sasl1.pobox.com (Postfix) with ESMTP id 082D042B05 for ; Sun, 5 Apr 2015 11:40:30 -0400 (EDT) Received: from badger (unknown [88.160.190.192]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by pb-sasl1.pobox.com (Postfix) with ESMTPSA id 506DF42B00 for ; Sun, 5 Apr 2015 11:40:28 -0400 (EDT) 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+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Gettext wants to dlopen expat on "linux" platforms. Guix used to fix this, but the fix was removed for some reason in the past, resulting in an xgettext that can't find expat and thus can't handle Glade files. GTK+ 3.16.0 requires xgettext to support Glade files. This patch fixes the issue. Thanks to Ludovic for the tip. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-gettext-Link-explicitly-to-libexpat-again.patch >From 8e2db815693ef8a300e860fd2601ad1996f90cf9 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 5 Apr 2015 10:22:28 +0200 Subject: [PATCH 1/3] gnu: gettext: Link explicitly to libexpat, again. * gnu/packages/gettext.scm (gnu-gettext): Re-enable patch from 0e4e4b1329bcf881620f230fda60b6b63d1f8356 to explictly link to libexpat. Otherwise libexpat was searched at runtime via dlopen, which obviously doesn't work in a Guix context. --- gnu/packages/gettext.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 27b5fb5..3a96cd6 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -70,7 +70,15 @@ (substitute* "gettext-tools/src/project-id" (("/bin/pwd") "pwd"))))) - %standard-phases) + (alist-cons-before + 'configure 'link-expat + (lambda _ + ;; Gettext defaults to opening expat via dlopen on + ;; "Linux". Change to link directly. + (substitute* "gettext-tools/configure" + (("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"") + (("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\""))) + %standard-phases)) ;; When tests fail, we want to know the details. #:make-flags '("VERBOSE=yes"))) -- 2.2.1 --=-=-= Content-Type: text/plain -- http://wingolog.org/ --=-=-=--