diff mbox series

[bug#50086,1/2] gnu: pth: Update ‘config.guess’ and ‘config.sub’

Message ID 20210817045553.11746-1-bauermann@kolabnow.com
State Accepted
Headers show
Series Update config.guess and config.sub for powerpc64le | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Thiago Jung Bauermann Aug. 17, 2021, 4:55 a.m. UTC 
The original versions are too old to recognize architectures such as
aarch64 and powerpc64le.

* gnu/packages/pth.scm (pth)[arguments]: Change from quasiquote to quote.
[#:phases]{update-config-scripts}: New.
[native-inputs]: Add ‘config’.
---

Hi,

As mentioned in the cover letter, this fixes the build for
powerpc64le-linux. I believe it will also work for aarch64-linux but
I wasn’t able to test on that platform.

Thanks,
Thiago

 gnu/packages/pth.scm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

Comments

Thiago Jung Bauermann Aug. 17, 2021, 2:26 p.m. UTC | #1 
Hello,

I forgot to mention that this patch series is for core-updates-frozen.

Also in the meantime I was able to confirm that with this patch it’s 
possible to cross-compile ‘pth’ for aarch64-linux, which is nice.

Em terça-feira, 17 de agosto de 2021, às 01:55:52 -03, Thiago Jung 
Bauermann escreveu:
> The original versions are too old to recognize architectures such as
> aarch64 and powerpc64le.
> 
> * gnu/packages/pth.scm (pth)[arguments]: Change from quasiquote to quote.

Finally, the changelog is missing a line here:

[#:configure-flags]: Remove.

> [#:phases]{update-config-scripts}: New.
> [native-inputs]: Add ‘config’.
diff mbox series

Patch

diff --git a/gnu/packages/pth.scm b/gnu/packages/pth.scm
index 1908ce776333..9f3dda5ae175 100644
--- a/gnu/packages/pth.scm
+++ b/gnu/packages/pth.scm
@@ -2,6 +2,7 @@ 
 ;;; Copyright © 2012, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,6 +20,7 @@ 
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages pth)
+  #:use-module (gnu packages autotools)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -38,12 +40,19 @@ 
         "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:parallel-build? #f
-       #:configure-flags (list 
-                           ,@(if (string=? "aarch64-linux"
-                                           (%current-system))
-                               '("--host=aarch64-unknown-linux-gnu")
-                               '()))))
+     '(#:parallel-build? #f
+       #: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")))))))
+    (native-inputs
+     (list config))
     (home-page "https://www.gnu.org/software/pth/")
     (synopsis "Portable thread library")
     (description