From patchwork Wed Apr 23 23:08:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41962 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 AD69827BC49; Thu, 24 Apr 2025 00:09:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9389227BC4A for ; Thu, 24 Apr 2025 00:09:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7jDN-0004yU-L5; Wed, 23 Apr 2025 19:09:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7jDF-0004vg-UZ for guix-patches@gnu.org; Wed, 23 Apr 2025 19:09:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7jDF-00038S-LP for guix-patches@gnu.org; Wed, 23 Apr 2025 19:09:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=QOnaR8Bz7qm+kKgwZI1ik9iVKVQOSUa0aKKk0yWAOeY=; b=TvjRnOpZ/fIA3NSr3SSpcN5Gzjafj7UApQBl5caCAHOVldqjf9dFDS1XI5U5L71u5nVK7oIZQVqXVzHptce2hDaW5+z8iuUA1N7laCrk8ZTwfhZuoPeoLGrbeVpSkjgSuVJTPXW04sNPBQF44CkeV9fzaDGlL/h9wPu2iSd5SLr1QCZmO2aIan041M36Dly7QDJivUw4WXU/lsEkAoqkV+LJpumzjnLnpVAVVP0sdPbNB92cDmZTVMLqGF4djU8mquzh7QUtNsfV8p+wQrrq6jqNvhQoTYFo1T0jK+E6s0hVUcQ2ukyU3ytcFKp42S1Qnu4wv0v4BlKycOfwFn/Mbw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7jDF-0005XJ-Eu for guix-patches@gnu.org; Wed, 23 Apr 2025 19:09:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78022] [PATCH 7/8] gnu: gst-kaldi-nnet2-online: Fix build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Apr 2025 23:09:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78022 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78022@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78022-submit@debbugs.gnu.org id=B78022.174544972221184 (code B ref 78022); Wed, 23 Apr 2025 23:09:05 +0000 Received: (at 78022) by debbugs.gnu.org; 23 Apr 2025 23:08:42 +0000 Received: from localhost ([127.0.0.1]:59536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7jCr-0005VW-MT for submit@debbugs.gnu.org; Wed, 23 Apr 2025 19:08:42 -0400 Received: from 8.mo563.mail-out.ovh.net ([46.105.60.197]:40113) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7jCk-0005UU-EV for 78022@debbugs.gnu.org; Wed, 23 Apr 2025 19:08:35 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZjZXd0cX5z1c6B; Wed, 23 Apr 2025 23:08:33 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78022@debbugs.gnu.org>; Wed, 23 Apr 2025 23:08:32 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.39]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZjZXc6scHz7wVj; Wed, 23 Apr 2025 23:08:32 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 98E1BBA3F0F; Wed, 23 Apr 2025 23:08:32 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-96R001f235e1b4-460a-439b-b1c6-135e58116ae3, 299BDCF71F74AF9523BA0ED19DF3CA9E8A5786D9) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Thu, 24 Apr 2025 01:08:11 +0200 Message-ID: <20250423230821.1141-7-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423230821.1141-1-ngraves@ngraves.fr> References: <20250423230821.1141-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 8282119714993726178 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvgeejkeejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepgeekfedvjedvtdduteejffelieduieffhffhkeelvddvtdffudeiudefveelvdegnecuffhomhgrihhnpehkrghlughiqdgrshhrrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedtvddvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=QOnaR8Bz7qm+kKgwZI1ik9iVKVQOSUa0aKKk0yWAOeY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745449713; v=1; b=5U2JVc7+Wan3HSM/yhQPkmcnC0kHRjjLE69kJcclBYUkKo0S9NyArdRa7T1jIFgvtAGPuOic Qqc0AXAHvHhfdweseS7yv2TamAmMJqbLT9+OsQoFZ6ydIn2mfCuVoWf1euE5Vcx6cQEXWnlY5bs ABJ/XgZYpZ31Y+eSmnVue4zBbMZDIYDyUbBTkAhbMBrdaJ2ytmwJ+/JUTq9ZamiAlgb0S4Fu/T4 WewsBrRLhFobxmFPwRdZwhwa8wuOgyGJAUo7ZFbgfItzA4JmIwgmrbFRkXn4dK6HG+BKDLAVjQK kfdylFH+AOKmox2gK3yMnVdAsvk3YOGOBfKulcBJziOVA== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/machine-learning.scm (gst-kaldi-nnet2-online): Fix build. [arguments]: Improve style. : Migrate to gexps, improve style. Add configure CXXFLAGS for OPENFST_VER, fixes build. [native-inputs]: Improve style. --- gnu/packages/machine-learning.scm | 73 ++++++++++++++++--------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a4eff194eaf..fb583e93273 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3152,45 +3152,48 @@ (define-public gst-kaldi-nnet2-online (list #:tests? #f ; there are none #:make-flags - '(list (string-append "SHELL=" - (assoc-ref %build-inputs "bash") "/bin/bash") - (string-append "KALDI_ROOT=" - (assoc-ref %build-inputs "kaldi-src")) - (string-append "KALDILIBDIR=" - (assoc-ref %build-inputs "kaldi") "/lib") - "KALDI_FLAVOR=dynamic") + (let ((kaldi (this-package-input "kaldi")) + (bash (this-package-native-input "bash"))) + #~(list (string-append "SHELL=" #$bash "/bin/bash") + (string-append "KALDI_ROOT=" #$(package-source kaldi)) + (string-append "KALDILIBDIR=" #$kaldi "/lib") + "KALDI_FLAVOR=dynamic")) #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "src"))) - (replace 'configure - (lambda* (#:key inputs #:allow-other-keys) - (let ((glib (assoc-ref inputs "glib"))) - (setenv "CXXFLAGS" "-fPIC") - (setenv "CPLUS_INCLUDE_PATH" - (string-append glib "/include/glib-2.0:" - glib "/lib/glib-2.0/include:" - (assoc-ref inputs "gstreamer") - "/include/gstreamer-1.0:" - (getenv "CPLUS_INCLUDE_PATH")))) - (substitute* "Makefile" - (("include \\$\\(KALDI_ROOT\\)/src/kaldi.mk") "") - (("\\$\\(error Cannot find") "#")))) - (add-before 'build 'build-depend - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "depend" make-flags))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib/gstreamer-1.0"))) - (install-file "libgstkaldinnet2onlinedecoder.so" lib))))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "src"))) + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((fst-version #$(package-version + (this-package-input "openfst")))) + (setenv "CXXFLAGS" + (string-append + "-fPIC -DOPENFST_VER=" + (string-join (string-split fst-version #\.) "0"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (append (map (lambda (dir) + (search-input-directory inputs dir)) + '("/include/glib-2.0" + "/lib/glib-2.0/include" + "/include/gstreamer-1.0")) + (list (getenv "CPLUS_INCLUDE_PATH"))) + ":"))) + (substitute* "Makefile" + (("include \\$\\(KALDI_ROOT\\)/src/kaldi.mk") "") + (("\\$\\(error Cannot find") "#")))) + (add-before 'build 'build-depend + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "depend" make-flags))) + (replace 'install + (lambda _ + (install-file + "libgstkaldinnet2onlinedecoder.so" + (string-append #$output "/lib/gstreamer-1.0"))))))) (inputs (list glib gstreamer jansson openfst kaldi)) (native-inputs - `(("bash" ,bash) - ("glib:bin" ,glib "bin") ; glib-genmarshal - ("kaldi-src" ,(package-source kaldi)) - ("pkg-config" ,pkg-config))) + (list bash `(,glib "bin") pkg-config)) (home-page "https://kaldi-asr.org/") (synopsis "Gstreamer plugin for decoding speech") (description "This package provides a GStreamer plugin that wraps