gnu: aalib: Update ‘config.guess’ and ‘config.sub’
The original versions are too old to recognize architectures such as
aarch64, mips64el and powerpc64le.
* gnu/packages/video.scm (aalib)[native-inputs]: Add ‘config’.
[arguments]<#:phases>{update-configure-scripts}: New.
{configure}: Don’t set host explicitly.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
			
			
This commit is contained in:
		
							parent
							
								
									6b85b4cf9b
								
							
						
					
					
						commit
						533f9b13d8
					
				
					 1 changed files with 12 additions and 12 deletions
				
			
		| 
						 | 
					@ -53,6 +53,7 @@
 | 
				
			||||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 | 
					;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 | 
				
			||||||
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 | 
					;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 | 
				
			||||||
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 | 
					;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 | 
				
			||||||
 | 
					;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; This file is part of GNU Guix.
 | 
					;;; This file is part of GNU Guix.
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
| 
						 | 
					@ -676,12 +677,22 @@ stream decoding")
 | 
				
			||||||
                "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"))))
 | 
					                "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("makeinfo" ,texinfo)))
 | 
					     `(("config" ,config)
 | 
				
			||||||
 | 
					       ("makeinfo" ,texinfo)))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("ncurses" ,ncurses)))
 | 
					     `(("ncurses" ,ncurses)))
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:phases
 | 
					     `(#:phases
 | 
				
			||||||
       (modify-phases %standard-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
 | 
					         (replace 'configure
 | 
				
			||||||
                  (lambda* (#:key build inputs outputs #:allow-other-keys)
 | 
					                  (lambda* (#:key build inputs outputs #:allow-other-keys)
 | 
				
			||||||
                    ;; This old `configure' script doesn't support
 | 
					                    ;; This old `configure' script doesn't support
 | 
				
			||||||
| 
						 | 
					@ -692,17 +703,6 @@ stream decoding")
 | 
				
			||||||
                      (invoke "./configure"
 | 
					                      (invoke "./configure"
 | 
				
			||||||
                              (string-append "--prefix=" out)
 | 
					                              (string-append "--prefix=" out)
 | 
				
			||||||
                              (string-append "--build=" build)
 | 
					                              (string-append "--build=" build)
 | 
				
			||||||
                              ;; The ancient config.guess is unable to
 | 
					 | 
				
			||||||
                              ;; guess the host triplet on mips64el.
 | 
					 | 
				
			||||||
                              ,@(if (string=? "mips64el-linux"
 | 
					 | 
				
			||||||
                                              (%current-system))
 | 
					 | 
				
			||||||
                                    '("--host=mips64el-unknown-linux-gnu")
 | 
					 | 
				
			||||||
                                    '())
 | 
					 | 
				
			||||||
                              ;; The same is also true with aarch64.
 | 
					 | 
				
			||||||
                              ,@(if (string=? "aarch64-linux"
 | 
					 | 
				
			||||||
                                              (%current-system))
 | 
					 | 
				
			||||||
                                    '("--host=aarch64-unknown-linux-gnu")
 | 
					 | 
				
			||||||
                                    '())
 | 
					 | 
				
			||||||
                              (string-append "--with-ncurses="
 | 
					                              (string-append "--with-ncurses="
 | 
				
			||||||
                                             ncurses))))))))
 | 
					                                             ncurses))))))))
 | 
				
			||||||
    (home-page "http://aa-project.sourceforge.net/aalib/")
 | 
					    (home-page "http://aa-project.sourceforge.net/aalib/")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue