mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: Remove obsolete bootstrap workaround phases.
* gnu/packages/admin.scm (igt-gpu-tools)[arguments]: Don't set NOCONFIGURE environment variable. * gnu/packages/algebra.scm (givaro, fflas-ffpack, linbox), * gnu/packages/arcan.scm (xarcan), * gnu/packages/audio.scm (rtmidi), * gnu/packages/cinnamon.scm (cinnamon-desktop), * gnu/packages/gnome.scm (dia, libxklavier, byzanz), * gnu/packages/image-viewers.scm (geeqie), * gnu/packages/libusb.scm (libplist), * gnu/packages/mail.scm (libetpan), * gnu/packages/networking.scm (aircrack-ng), * gnu/packages/terminals.scm (tilda, kmscon), * gnu/packages/xorg.scm (xf86-video-intel, xcompmgr) [arguments]: Same.
This commit is contained in:
parent
481a0f1a7c
commit
778d6b522a
12 changed files with 9 additions and 121 deletions
|
@ -2802,14 +2802,7 @@ (define-public igt-gpu-tools
|
|||
(base32 "1gpdjs5aj6vsnzwcjvw5bb120lgffvvshi4202phr0bzw3b92ky8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; many of the tests try to load kernel modules
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'bootstrap
|
||||
(lambda _
|
||||
;; Don't run configure in this phase.
|
||||
(setenv "NOCONFIGURE" "1")
|
||||
(invoke "sh" "autogen.sh"))))))
|
||||
`(#:tests? #f)) ; many of the tests try to load kernel modules
|
||||
(inputs
|
||||
`(("cairo" ,cairo)
|
||||
("elfutils" ,elfutils) ; libdw
|
||||
|
|
|
@ -1217,15 +1217,6 @@ (define-public givaro
|
|||
("libtool" ,libtool)))
|
||||
(propagated-inputs
|
||||
`(("gmp" ,gmp))) ; gmp++.h includes gmpxx.h
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'setenv
|
||||
;; Prevent the autogen.sh script to carry out the configure
|
||||
;; script, which has not yet been patched to replace /bin/sh.
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "yes")
|
||||
#t)))))
|
||||
(synopsis "Algebraic computations with exact rings and fields")
|
||||
(description
|
||||
"Givaro is a C++ library implementing the basic arithmetic of various
|
||||
|
@ -1264,15 +1255,7 @@ (define-public fflas-ffpack
|
|||
`(#:configure-flags
|
||||
(list (string-append "--with-blas-libs="
|
||||
(assoc-ref %build-inputs "openblas")
|
||||
"/lib/libopenblas.so"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'setenv
|
||||
;; Prevent the autogen.sh script to carry out the configure
|
||||
;; script, which has not yet been patched to replace /bin/sh.
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "yes")
|
||||
#t)))))
|
||||
"/lib/libopenblas.so"))))
|
||||
(synopsis "C++ library for linear algebra over finite fields")
|
||||
(description
|
||||
"FFLAS-FFPACK is a C++ template library for basic linear algebra
|
||||
|
@ -1308,15 +1291,6 @@ (define-public linbox
|
|||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("fflas-ffpack" ,fflas-ffpack)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'setenv
|
||||
;; Prevent the autogen.sh script to carry out the configure
|
||||
;; script, which has not yet been patched to replace /bin/sh.
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "yes")
|
||||
#t)))))
|
||||
(synopsis "C++ library for linear algebra over exact rings")
|
||||
(description
|
||||
"LinBox is a C++ template library for exact linear algebra computation
|
||||
|
|
|
@ -216,13 +216,7 @@ (define-public xarcan
|
|||
(assoc-ref %build-inputs "xkbcomp")
|
||||
"/bin")
|
||||
,(string-append "--with-xkb-output="
|
||||
"/tmp")) ; FIXME: Copied from xorg
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'noconfigure
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "true")
|
||||
#t)))))
|
||||
"/tmp")))) ; FIXME: Copied from xorg
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("autoconf" ,autoconf)
|
||||
|
|
|
@ -2444,13 +2444,6 @@ (define-public rtmidi
|
|||
(base32
|
||||
"1k962ljpnwyjw9jjiky2372khhri1wqvrj5qsalfpys31xqzw31p"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'noconfigure
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "yes")
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("jack" ,jack-1)
|
||||
("alsa-lib" ,alsa-lib)))
|
||||
|
|
|
@ -51,13 +51,6 @@ (define-public cinnamon-desktop
|
|||
(base32
|
||||
"18mjy80ly9361npjhxpm3n0pkmrwviaqr2kixjb7hyxa6kzzh5xw"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'skip-premature-configure
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "set")
|
||||
#t)))))
|
||||
;; TODO: package 'libgsystem'.
|
||||
(inputs
|
||||
`(("accountsservice" ,accountsservice)
|
||||
|
|
|
@ -911,13 +911,6 @@ (define-public dia
|
|||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-wrapper" ,python-wrapper)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'dont-configure-during-bootstrap
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "true")
|
||||
#t)))))
|
||||
(home-page "https://wiki.gnome.org/Apps/Dia")
|
||||
(synopsis "Diagram creation for GNOME")
|
||||
(description "Dia can be used to draw different types of diagrams, and
|
||||
|
@ -3505,13 +3498,7 @@ (define-public libxklavier
|
|||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'no-configure
|
||||
(lambda* _
|
||||
(setenv "NOCONFIGURE" "1")
|
||||
#t)))
|
||||
#:configure-flags
|
||||
'(#:configure-flags
|
||||
(list (string-append "--with-xkb-base="
|
||||
(assoc-ref %build-inputs "xkeyboard-config")
|
||||
"/share/X11/xkb")
|
||||
|
@ -7924,7 +7911,7 @@ (define-public byzanz
|
|||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'bootstrap
|
||||
(add-before 'bootstrap 'build-without-Werror
|
||||
(lambda _
|
||||
;; The build system cleverly detects that we're not building from
|
||||
;; a release tarball and turns on -Werror for GCC.
|
||||
|
@ -7932,11 +7919,7 @@ (define-public byzanz
|
|||
;; causes the build to fail unnecessarily, so we remove the flag.
|
||||
(substitute* '("configure.ac")
|
||||
(("-Werror") ""))
|
||||
;; The autogen.sh script in gnome-common will run ./configure
|
||||
;; by default, which is problematic because source shebangs
|
||||
;; have not yet been patched.
|
||||
(setenv "NOCONFIGURE" "t")
|
||||
(zero? (system* "sh" "autogen.sh")))))))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
|
|
|
@ -155,7 +155,6 @@ (define (write-dummy-changelog port)
|
|||
write-dummy-changelog)
|
||||
(call-with-output-file "ChangeLog.html"
|
||||
write-dummy-changelog)
|
||||
(setenv "NOCONFIGURE" "true")
|
||||
|
||||
;; Don't try to run 'git' for the version number.
|
||||
(substitute* "configure.ac"
|
||||
|
|
|
@ -318,14 +318,7 @@ (define-public libplist
|
|||
(base32 "02vraf4j46bp746s0gz7vga2gv2dy3zd1v1bsy9x8algg9fpcb7n"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'configure-later
|
||||
;; Don't run ./configure during bootstrap.
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "set")
|
||||
#t)))
|
||||
;; Tests fail randomly when run in parallel because several of them write
|
||||
`(;; Tests fail randomly when run in parallel because several of them write
|
||||
;; and read to/from the same file--e.g., "4.plist" is accessed by
|
||||
;; 'large.test' and 'largecmp.test'.
|
||||
#:parallel-tests? #f))
|
||||
|
|
|
@ -1133,13 +1133,7 @@ (define-public libetpan
|
|||
("expat" ,expat)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'bootstrap
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "true")
|
||||
(invoke "sh" "autogen.sh"))))
|
||||
#:configure-flags
|
||||
'(#:configure-flags
|
||||
'("--disable-static" "--disable-db")))
|
||||
(home-page "https://www.etpan.org/libetpan.html")
|
||||
(synopsis "Portable middleware for email access")
|
||||
|
|
|
@ -934,12 +934,6 @@ (define-public aircrack-ng
|
|||
(("/bin/sh")
|
||||
(which "sh")))
|
||||
#t))
|
||||
(replace 'bootstrap
|
||||
(lambda _
|
||||
;; Patch shebangs in generated files before running
|
||||
;; ./configure.
|
||||
(setenv "NOCONFIGURE" "please")
|
||||
(invoke "bash" "./autogen.sh")))
|
||||
(add-after 'build 'absolutize-tools
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((ethtool (string-append (assoc-ref inputs "ethtool")
|
||||
|
|
|
@ -96,12 +96,6 @@ (define-public tilda
|
|||
(base32
|
||||
"154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(replace 'bootstrap
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "true")
|
||||
(invoke "sh" "autogen.sh"))))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
|
@ -276,10 +270,6 @@ (define-public kmscon
|
|||
#:disallowed-references (,mesa)
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
(replace 'bootstrap
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "indeed")
|
||||
(invoke "sh" "autogen.sh")))
|
||||
;; Use elogind instead of systemd.
|
||||
(add-before 'configure 'remove-systemd
|
||||
(lambda _
|
||||
|
|
|
@ -2980,13 +2980,7 @@ (define-public xf86-video-intel
|
|||
(string-prefix? "x86_64-" system)))
|
||||
%supported-systems))
|
||||
(arguments
|
||||
'(#:configure-flags '("--with-default-accel=uxa")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'pre-bootstrap
|
||||
(lambda _
|
||||
;; Inhibit autogen.sh from running configure.
|
||||
(setenv "NOCONFIGURE" "1")
|
||||
#t)))))
|
||||
'(#:configure-flags '("--with-default-accel=uxa")))
|
||||
(home-page "https://www.x.org/wiki/")
|
||||
(synopsis "Intel video driver for X server")
|
||||
(description
|
||||
|
@ -6079,12 +6073,6 @@ (define-public xcompmgr
|
|||
(base32 "11i7vyk3pynw8q8aczpy56qncm84y0cmhlvyja3sj8dgy60g03q2"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'autogen
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "t")
|
||||
(invoke "sh" "autogen.sh"))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("autoconf" ,autoconf)
|
||||
|
|
Loading…
Reference in a new issue