ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove redundant cmake libdir configure flags.

Browse source 
* gnu/packages/bioinformatics.scm (imp)[arguments]: Remove
CMAKE_INSTALL_LIBDIR flag.
* gnu/packages/calendar.scm (libical): Same.
* gnu/packages/engineering.scm (kicad): Same.
* gnu/packages/games.scm (openrct2, mgba): Same.
* gnu/packages/gl.scm (virtualgl): Same.
* gnu/packages/image-processing.scm (mia): Same.
* gnu/packages/linux.scm (rdma-core): Same.
* gnu/packages/machine-learning.scm (dlib): Same.
* gnu/packages/maths.scm (lapack, superlu, z3): Same.
* gnu/packages/password-utils.scm (keepassxc): Same.
* gnu/packages/photo.scm (darktable): Same.
* gnu/packages/rdesktop.scm (freerdp): Same.
This commit is contained in:
Efraim Flashner 2017-12-19 16:25:12 +02:00
parent 5857a0658a
commit 677bc34d5b
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
12 changed files with 8 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/bioinformatics.scm
View file

@ -10724,10 +10724,7 @@ (define-public imp
(arguments (arguments
`(;; FIXME: Some tests fail because they produce warnings, others fail `(;; FIXME: Some tests fail because they produce warnings, others fail
;; because the PYTHONPATH does not include the modeller's directory. ;; because the PYTHONPATH does not include the modeller's directory.
#:tests? #f #:tests? #f))
;; Do not place libraries in an architecture-specific directory.
#:configure-flags
(list "-DCMAKE_INSTALL_LIBDIR=lib")))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("gsl" ,gsl) ("gsl" ,gsl)

3
gnu/packages/calendar.scm
View file

@ -56,9 +56,6 @@ (define-public libical
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; test suite appears broken '(#:tests? #f ; test suite appears broken
#:configure-flags
(list (string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out") "/lib"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-paths (add-before 'configure 'patch-paths

2
gnu/packages/engineering.scm
View file

@ -693,8 +693,6 @@ (define-public kicad
(string-take commit 7)) (string-take commit 7))
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Release"
"-DKICAD_SKIP_BOOST=ON"; Use our system's boost library. "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library.
(string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out") "/lib")
"-DKICAD_SCRIPTING=ON" "-DKICAD_SCRIPTING=ON"
"-DKICAD_SCRIPTING_MODULES=ON" "-DKICAD_SCRIPTING_MODULES=ON"
"-DKICAD_SCRIPTING_WXPYTHON=ON" "-DKICAD_SCRIPTING_WXPYTHON=ON"

11
gnu/packages/games.scm
View file

@ -2778,9 +2778,6 @@ (define-public openrct2
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;; no tests available `(#:tests? #f ;; no tests available
#:configure-flags
(list (string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out") "/lib"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-usr-share-paths (add-after 'unpack 'fix-usr-share-paths
@ -3285,13 +3282,7 @@ (define-public mgba
`(#:tests? #f ;no "test" target `(#:tests? #f ;no "test" target
#:configure-flags #:configure-flags
(list "-DUSE_LZMA=OFF" ;do not use bundled LZMA (list "-DUSE_LZMA=OFF" ;do not use bundled LZMA
"-DUSE_LIBZIP=OFF" ;use "zlib" instead "-DUSE_LIBZIP=OFF"))) ;use "zlib" instead
;; Validate RUNPATH phase fails ("error: depends on
;; 'libmgba.so.0.6', which cannot be found in RUNPATH") without
;; the following S-exp.
(string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out")
"/lib"))))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("ffmpeg" ,ffmpeg) (inputs `(("ffmpeg" ,ffmpeg)
("imagemagick" ,imagemagick) ("imagemagick" ,imagemagick)

4
gnu/packages/gl.scm
View file

@ -742,9 +742,7 @@ (define-public virtualgl
"0rnid3hwrry9d5d4m7sygq00xxx976rgk00a3557m9r5kxbmy476")))) "0rnid3hwrry9d5d4m7sygq00xxx976rgk00a3557m9r5kxbmy476"))))
(arguments (arguments
`(#:tests? #f ;; no tests are available `(#:tests? #f ;; no tests are available
#:configure-flags (list "-DVGL_USESSL=1" ;; use OpenSSL #:configure-flags (list "-DVGL_USESSL=1"))) ;; use OpenSSL
(string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out") "/lib"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs `(("glu" ,glu) (inputs `(("glu" ,glu)
("libjpeg-turbo" ,libjpeg-turbo) ("libjpeg-turbo" ,libjpeg-turbo)

2
gnu/packages/image-processing.scm
View file

@ -98,8 +98,6 @@ (define-public mia
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "-DMIA_CREATE_NIPYPE_INTERFACES=0" (list "-DMIA_CREATE_NIPYPE_INTERFACES=0"
(string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out") "/lib")
"-DCMAKE_CXX_FLAGS=-fpermissive"))) "-DCMAKE_CXX_FLAGS=-fpermissive")))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)

3
gnu/packages/linux.scm
View file

@ -3348,9 +3348,6 @@ (define-public rdma-core
;; to do the same for consistency. They also recommend using the ;; to do the same for consistency. They also recommend using the
;; "Release" build type. ;; "Release" build type.
#:configure-flags (list "-GNinja" #:configure-flags (list "-GNinja"
;; Defaults to "lib64" on 64-bit archs.
(string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out") "/lib")
"-DCMAKE_BUILD_TYPE=Release") "-DCMAKE_BUILD_TYPE=Release")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases

6
gnu/packages/machine-learning.scm
View file

@ -542,11 +542,7 @@ (define-public dlib
#t)))) #t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; Recent releases defaults to "lib64" on 64bit. `(#:phases
`(#:configure-flags (list (string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out")
"/lib"))
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'disable-asserts (add-after 'unpack 'disable-asserts
(lambda _ (lambda _

15
gnu/packages/maths.scm
View file

@ -463,12 +463,6 @@ (define-public lapack
("python" ,python-2))) ("python" ,python-2)))
(arguments (arguments
`(#:configure-flags (list `(#:configure-flags (list
;; Install to PREFIX/lib (the default is
;; PREFIX/lib64).
(string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out")
"/lib")
"-DBUILD_SHARED_LIBS:BOOL=YES" "-DBUILD_SHARED_LIBS:BOOL=YES"
"-DLAPACKE=ON" "-DLAPACKE=ON"
@ -1962,8 +1956,7 @@ (define-public superlu
(arguments (arguments
`(#:configure-flags '("-Denable_blaslib:BOOL=NO" ;do not use internal cblas `(#:configure-flags '("-Denable_blaslib:BOOL=NO" ;do not use internal cblas
"-DTPL_BLAS_LIBRARIES=openblas" "-DTPL_BLAS_LIBRARIES=openblas"
"-DBUILD_SHARED_LIBS:BOOL=YES" "-DBUILD_SHARED_LIBS:BOOL=YES")))
"-DCMAKE_INSTALL_LIBDIR=lib")))
(home-page "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/") (home-page "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/")
(synopsis "Supernodal direct solver for sparse linear systems") (synopsis "Supernodal direct solver for sparse linear systems")
(description (description
@ -3571,11 +3564,7 @@ (define-public z3
"-DINSTALL_PYTHON_BINDINGS=true" "-DINSTALL_PYTHON_BINDINGS=true"
(string-append "-DCMAKE_INSTALL_PYTHON_PKG_DIR=" (string-append "-DCMAKE_INSTALL_PYTHON_PKG_DIR="
%output %output
"/lib/python2.7/site-packages") "/lib/python2.7/site-packages"))
(string-append "-DCMAKE_INSTALL_LIBDIR="
%output
"/lib"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'bootstrap (add-before 'configure 'bootstrap

4
gnu/packages/password-utils.scm
View file

@ -99,10 +99,6 @@ (define-public keepassxc
(base32 (base32
"0wrl8kxb16wzdgfjj057yv18cfg0b8z8lxp1fl2q8fkdgr7phm9g")))) "0wrl8kxb16wzdgfjj057yv18cfg0b8z8lxp1fl2q8fkdgr7phm9g"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out") "/lib"))))
(inputs (inputs
`(("libgcrypt" ,libgcrypt) `(("libgcrypt" ,libgcrypt)
("libxi" ,libxi) ("libxi" ,libxi)

2
gnu/packages/photo.scm
View file

@ -337,7 +337,7 @@ (define-public darktable
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; There are no tests. `(#:tests? #f ; There are no tests.
#:configure-flags '("-DCMAKE_INSTALL_LIBDIR=lib" "-DBINARY_PACKAGE_BUILD=On") #:configure-flags '("-DBINARY_PACKAGE_BUILD=On")
#:make-flags #:make-flags
(list (list
(string-append "CPATH=" (assoc-ref %build-inputs "ilmbase") (string-append "CPATH=" (assoc-ref %build-inputs "ilmbase")

3
gnu/packages/rdesktop.scm
View file

@ -112,8 +112,7 @@ (define-public freerdp
("openssl" ,openssl))) ("openssl" ,openssl)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "-DCMAKE_INSTALL_LIBDIR=lib" (list "-DCMAKE_BUILD_TYPE=RELEASE"
"-DCMAKE_BUILD_TYPE=RELEASE"
"-DWITH_JPEG=ON" "-DWITH_JPEG=ON"
,@(if (string-prefix? "x86_64" ,@(if (string-prefix? "x86_64"
(or (%current-target-system) (or (%current-target-system)