From patchwork Wed Aug 25 18:02:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32273 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4154727BBE3; Wed, 25 Aug 2021 19:05:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E890E27BBE1 for ; Wed, 25 Aug 2021 19:05:48 +0100 (BST) Received: from localhost ([::1]:60480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxHY-0002pa-2J for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:05:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxG0-00086N-Vb for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36182) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFx-0000tJ-HP for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFx-0002of-DD for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 16/52] gobject-introspection: Correct library name when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991464110653 (code B ref 50201); Wed, 25 Aug 2021 18:04:09 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:04:01 +0000 Received: from localhost ([127.0.0.1]:47697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFo-0002lb-V4 for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:04:01 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFY-0002g9-L9 for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:45 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3kUS; Wed, 25 Aug 2021 20:03:44 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:56 +0200 Message-Id: <20210825180332.5720-16-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914624; bh=6KEohBV31jnOIWGlZtl8C2vldCOk/inpCMNihQgXbVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OeSRY66SxUSMl8DtyHBhDSvDWApI5CtEoYx/3Qy4lni+Ekp6QqXH52L3GA5jQ6nWS H3uemAtiHgn3+18SUOssTb/lDGWG4Z120ICX3aNDmoCg7Ho2AkC5XzQYQjWhWHV0SY BqJGgkzULzk8QJ9jC6FENYrEi1WXhSpu7CcShSmU3UrBf+mDjrIQaVu+lFZq6W8XKW +7VjMBjvB5X2c4IQ62QWXTK1KgTyRw9YTL5vegPvn9ktjLiDyMzXJ8TelyoCGwHKo9 deQSNJeIErDwa5UirOCBVGqwKeKUiAA7XAs1bviLXvzZseZaiTyPRz2Yo7ODPZElXj WBfKHAul24DMQ== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (gobject-introspection)[arguments]<#:phases>{rename-library}: Correct the name of the python extension when cross-compiling. --- gnu/packages/glib.scm | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ac38cd40d2..0c2f548f62 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -411,21 +411,40 @@ functions for strings and common data structures.") "-Dbuild_introspection_data=false")) '()) #:phases + ,#~ (modify-phases %standard-phases - ,@(if (%current-target-system) - ;; 'typelibs' is undefined. - `((add-after 'unpack 'set-typelibs - (lambda _ - (substitute* "meson.build" - (("\\bsources: typelibs\\b") - "sources: []"))))) - '()) + #$@(if (%current-target-system) + ;; 'typelibs' is undefined. + `((add-after 'unpack 'set-typelibs + (lambda _ + (substitute* "meson.build" + (("\\bsources: typelibs\\b") + "sources: []"))))) + '()) (add-after 'unpack 'do-not-use-/usr/bin/env (lambda _ (substitute* "tools/g-ir-tool-template.in" (("#!@PYTHON_CMD@") (string-append "#!" (which "python3")))) - #t))))) + #t)) + #$@(if (%current-target-system) + ;; Meson gives python extensions an incorrect name, see + ;; . + #~((add-after 'install 'rename-library + (lambda* (#:key build target #:allow-other-keys) + (define dir + (string-append #$output + "/lib/gobject-introspection/giscanner")) + ;; python uses strings like 'x86_64-linux-gnu', not + ;; 'x86_64-unknown-linux-gnu'. + (define (normalise-system system) + ((@ (ice-9 string-fun) string-replace-substring) + system "-unknown-" "-")) + (define (extension system) + (string-append dir "/_giscanner.cpython-39-" + (normalise-system system) ".so")) + (rename-file (extension build) (extension target))))) + #~())))) (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config)