[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: Remove redundant cmake libdir configure flags.
|
From: |
Efraim Flashner |
|
Subject: |
02/02: gnu: Remove redundant cmake libdir configure flags. |
|
Date: |
Tue, 19 Dec 2017 12:52:12 -0500 (EST) |
efraim pushed a commit to branch core-updates
in repository guix.
commit 677bc34d5b75d4c9a8020f9d0f917c3ca2fb3dc6
Author: Efraim Flashner <address@hidden>
Date: Tue Dec 19 16:25:12 2017 +0200
gnu: Remove redundant cmake libdir configure flags.
* 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.
---
gnu/packages/bioinformatics.scm | 5 +----
gnu/packages/calendar.scm | 3 ---
gnu/packages/engineering.scm | 2 --
gnu/packages/games.scm | 11 +----------
gnu/packages/gl.scm | 4 +---
gnu/packages/image-processing.scm | 2 --
gnu/packages/linux.scm | 3 ---
gnu/packages/machine-learning.scm | 6 +-----
gnu/packages/maths.scm | 15 ++-------------
gnu/packages/password-utils.scm | 4 ----
gnu/packages/photo.scm | 2 +-
gnu/packages/rdesktop.scm | 3 +--
12 files changed, 8 insertions(+), 52 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index cf026ab..479404b 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10724,10 +10724,7 @@ programs for inferring phylogenies (evolutionary
trees).")
(arguments
`(;; FIXME: Some tests fail because they produce warnings, others fail
;; because the PYTHONPATH does not include the modeller's directory.
- #:tests? #f
- ;; Do not place libraries in an architecture-specific directory.
- #:configure-flags
- (list "-DCMAKE_INSTALL_LIBDIR=lib")))
+ #:tests? #f))
(inputs
`(("boost" ,boost)
("gsl" ,gsl)
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 0f5cabd..0080542 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -56,9 +56,6 @@
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; test suite appears broken
- #:configure-flags
- (list (string-append "-DCMAKE_INSTALL_LIBDIR="
- (assoc-ref %outputs "out") "/lib"))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-paths
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 77b1386..dbd3c5e 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -693,8 +693,6 @@ language.")
(string-take commit 7))
"-DCMAKE_BUILD_TYPE=Release"
"-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_MODULES=ON"
"-DKICAD_SCRIPTING_WXPYTHON=ON"
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index b8e306a..df9eed7 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2778,9 +2778,6 @@ Transport Tycoon Deluxe.")
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;; no tests available
- #:configure-flags
- (list (string-append "-DCMAKE_INSTALL_LIBDIR="
- (assoc-ref %outputs "out") "/lib"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-usr-share-paths
@@ -3285,13 +3282,7 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
`(#:tests? #f ;no "test" target
#:configure-flags
(list "-DUSE_LZMA=OFF" ;do not use bundled LZMA
- "-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"))))
+ "-DUSE_LIBZIP=OFF"))) ;use "zlib" instead
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("ffmpeg" ,ffmpeg)
("imagemagick" ,imagemagick)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 62e272b..7de2ca5 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -742,9 +742,7 @@ mixed vector/bitmap output.")
"0rnid3hwrry9d5d4m7sygq00xxx976rgk00a3557m9r5kxbmy476"))))
(arguments
`(#:tests? #f ;; no tests are available
- #:configure-flags (list "-DVGL_USESSL=1" ;; use OpenSSL
- (string-append "-DCMAKE_INSTALL_LIBDIR="
- (assoc-ref %outputs "out") "/lib"))))
+ #:configure-flags (list "-DVGL_USESSL=1"))) ;; use OpenSSL
(build-system cmake-build-system)
(inputs `(("glu" ,glu)
("libjpeg-turbo" ,libjpeg-turbo)
diff --git a/gnu/packages/image-processing.scm
b/gnu/packages/image-processing.scm
index 0037fdb..4a8117f 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -98,8 +98,6 @@ licences similar to the Modified BSD licence."))))
(arguments
`(#:configure-flags
(list "-DMIA_CREATE_NIPYPE_INTERFACES=0"
- (string-append "-DCMAKE_INSTALL_LIBDIR="
- (assoc-ref %outputs "out") "/lib")
"-DCMAKE_CXX_FLAGS=-fpermissive")))
(inputs
`(("boost" ,boost)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 32851fc..f233609 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3348,9 +3348,6 @@ The package provides additional NTFS tools.")
;; to do the same for consistency. They also recommend using the
;; "Release" build type.
#: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")
#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/machine-learning.scm
b/gnu/packages/machine-learning.scm
index c8bd5d7..b86df11 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -542,11 +542,7 @@ and a QP solver.")
#t))))
(build-system cmake-build-system)
(arguments
- ;; Recent releases defaults to "lib64" on 64bit.
- `(#:configure-flags (list (string-append "-DCMAKE_INSTALL_LIBDIR="
- (assoc-ref %outputs "out")
- "/lib"))
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-asserts
(lambda _
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9e36b70..22d1130 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -463,12 +463,6 @@ large scale eigenvalue problems.")
("python" ,python-2)))
(arguments
`(#: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"
"-DLAPACKE=ON"
@@ -1962,8 +1956,7 @@ void mc64ad_ (int *a, int *b, int *c, int *d, int *e,
double *f, int *g,
(arguments
`(#:configure-flags '("-Denable_blaslib:BOOL=NO" ;do not use internal
cblas
"-DTPL_BLAS_LIBRARIES=openblas"
- "-DBUILD_SHARED_LIBS:BOOL=YES"
- "-DCMAKE_INSTALL_LIBDIR=lib")))
+ "-DBUILD_SHARED_LIBS:BOOL=YES")))
(home-page "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/";)
(synopsis "Supernodal direct solver for sparse linear systems")
(description
@@ -3571,11 +3564,7 @@ as equations, scalars, vectors, and matrices.")
"-DINSTALL_PYTHON_BINDINGS=true"
(string-append "-DCMAKE_INSTALL_PYTHON_PKG_DIR="
%output
- "/lib/python2.7/site-packages")
- (string-append "-DCMAKE_INSTALL_LIBDIR="
- %output
- "/lib"))
-
+ "/lib/python2.7/site-packages"))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'bootstrap
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index ffa152f..d83c244 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -99,10 +99,6 @@ human.")
(base32
"0wrl8kxb16wzdgfjj057yv18cfg0b8z8lxp1fl2q8fkdgr7phm9g"))))
(build-system cmake-build-system)
- (arguments
- `(#:configure-flags
- (list (string-append "-DCMAKE_INSTALL_LIBDIR="
- (assoc-ref %outputs "out") "/lib"))))
(inputs
`(("libgcrypt" ,libgcrypt)
("libxi" ,libxi)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 34a2180..94174cc 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -337,7 +337,7 @@ photographic equipment.")
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; There are no tests.
- #:configure-flags '("-DCMAKE_INSTALL_LIBDIR=lib"
"-DBINARY_PACKAGE_BUILD=On")
+ #:configure-flags '("-DBINARY_PACKAGE_BUILD=On")
#:make-flags
(list
(string-append "CPATH=" (assoc-ref %build-inputs "ilmbase")
diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 65d17de..1a2d041 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -112,8 +112,7 @@ to remotely control a user's Windows desktop.")
("openssl" ,openssl)))
(arguments
`(#:configure-flags
- (list "-DCMAKE_INSTALL_LIBDIR=lib"
- "-DCMAKE_BUILD_TYPE=RELEASE"
+ (list "-DCMAKE_BUILD_TYPE=RELEASE"
"-DWITH_JPEG=ON"
,@(if (string-prefix? "x86_64"
(or (%current-target-system)