From 0995a5692cb85418b2d5f21c24d46ee4aa9fb7c9 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 25 Nov 2018 22:30:35 -0600 Subject: qtwebkit: Fix pri install directory. * gnu/packages/qt.scm (qtwebkit)[arguments]: Add "ECM_MKSPECS_INSTALL_DIR" to #:configure-flags. --- gnu/packages/qt.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d487699827..d8860e79a4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Hartmut Goebel +;;; Copyright © 2018 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -2171,7 +2172,10 @@ different kinds of sliders, and much more.") #:configure-flags (list ;"-DENABLE_API_TESTS=TRUE" "-DPORT=Qt" "-DUSE_LIBHYPHEN=OFF" - "-DUSE_SYSTEM_MALLOC=ON"))) + "-DUSE_SYSTEM_MALLOC=ON" + ;; XXX: relative dir installs to build dir? + (string-append "-DECM_MKSPECS_INSTALL_DIR=" + %output "/lib/qt5/mkspecs/modules")))) (home-page "https://www.webkit.org") (synopsis "Web browser engine and classes to render and interact with web content") -- cgit v1.2.3 From ebdb15bc3540b1901f223bc0689bae51a2f88fc4 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 25 Nov 2018 22:31:29 -0600 Subject: qtwebkit: Reduce RAM requirements for linking. * gnu/packages/qt.scm (qtwebkit)[arguments]: Link shared libraries and executables with "--no-keep-memory". --- gnu/packages/qt.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d8860e79a4..36f8aef694 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2175,7 +2175,12 @@ different kinds of sliders, and much more.") "-DUSE_SYSTEM_MALLOC=ON" ;; XXX: relative dir installs to build dir? (string-append "-DECM_MKSPECS_INSTALL_DIR=" - %output "/lib/qt5/mkspecs/modules")))) + %output "/lib/qt5/mkspecs/modules") + ;; Sacrifice a little speed in order to link + ;; libraries and test executables in a + ;; reasonable amount of memory. + "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-keep-memory" + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-keep-memory"))) (home-page "https://www.webkit.org") (synopsis "Web browser engine and classes to render and interact with web content") -- cgit v1.2.3