all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 65646@debbugs.gnu.org, maxim.cournoyer@gmail.com
Cc: Marcel van der Boom <marcel@van-der-boom.nl>
Subject: [bug#65646] [PATCH 2/3] gnu: aalib: Really build the shared library on powerpc64le-linux.
Date: Thu, 31 Aug 2023 00:45:27 -0400	[thread overview]
Message-ID: <bc36d1337cb2fa3e3acfc2a047965df766542a6b.1693457128.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <9e32eeeef4dbc36eb02098925f7567b4cce50363.1693457127.git.maxim.cournoyer@gmail.com>

Fixes <https://issues.guix.gnu.org/57134>.

The old build scripts were buggy and causing a static library to be produced
instead, which would fail to be linked by gst-plugins-good.

* gnu/packages/video.scm (aalib) [native-inputs]: Remove labels.
[arguments]: Use gexps.
<configure-flags>: New argument.
<phases>: Remove update-config-scripts and configure override.
Add force-autoreconf.

Reported-by: Marcel van der Boom <marcel@van-der-boom.nl>
---
 gnu/packages/video.scm | 43 +++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ff52b9b38d..1a0880bf3c 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -50,7 +50,7 @@
 ;;; Copyright © 2021 Alexey Abramov <levenson@mmer.org>
 ;;; Copyright © 2021, 2022, 2023 Andrew Tropin <andrew@trop.in>
 ;;; Copyright © 2021 David Wilson <david@daviwil.com>
-;;; Copyright © 2021,2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 ;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
@@ -745,36 +745,19 @@ (define-public aalib
                (base32
                 "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"))))
     (build-system gnu-build-system)
-    (native-inputs
-     `(("config" ,config)
-       ("makeinfo" ,texinfo)))
-    (inputs
-     (list ncurses))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'update-config-scripts
-           (lambda* (#:key inputs native-inputs #:allow-other-keys)
-             ;; Replace outdated config.guess and config.sub.
-             (for-each (lambda (file)
-                         (install-file
-                          (search-input-file
-                           (or native-inputs inputs)
-                           (string-append "/bin/" file)) "."))
-                       '("config.guess" "config.sub"))))
-         (replace 'configure
-                  (lambda* (#:key build inputs outputs #:allow-other-keys)
-                    ;; This old `configure' script doesn't support
-                    ;; variables passed as arguments.
-                    (let ((out     (assoc-ref outputs "out"))
-                          (ncurses (assoc-ref inputs "ncurses")))
-                      (setenv "CONFIG_SHELL" (which "bash"))
-                      (invoke "./configure"
-                              "--disable-static"
-                              (string-append "--prefix=" out)
-                              (string-append "--build=" build)
-                              (string-append "--with-ncurses="
-                                             ncurses))))))))
+     (list
+      #:configure-flags
+      #~(list "--disable-static"
+              (string-append "--with-ncurses="
+                             #$(this-package-input "ncurses")))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'force-autoreconf
+            (lambda _
+              (delete-file "configure"))))))
+    (native-inputs (list autoconf automake libtool texinfo))
+    (inputs (list ncurses))
     (home-page "https://aa-project.sourceforge.net/aalib/")
     (synopsis "ASCII-art library")
     (description
-- 
2.41.0





  reply	other threads:[~2023-08-31  4:47 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-31  4:45 [bug#65645] [PATCH 1/3] gnu: qemu: Update to 7.2.4 Maxim Cournoyer
2023-08-31  4:45 ` Maxim Cournoyer [this message]
2023-08-31  4:45 ` [bug#65647] [PATCH 3/3] gnu: edk2-tools: Update to 202308 Maxim Cournoyer
2023-08-31 14:00 ` [bug#65645] [PATCH 1/3] gnu: qemu: Update to 7.2.4 André Batista
2023-09-01  2:59   ` Maxim Cournoyer
2023-09-02 19:03 ` [bug#65645] [PATCH] gnu: qemu: Update to 8.1.0 Kaelyn via Guix-patches via
2023-09-06  4:00   ` Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bc36d1337cb2fa3e3acfc2a047965df766542a6b.1693457128.git.maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=65646@debbugs.gnu.org \
    --cc=marcel@van-der-boom.nl \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.