* [PATCH] gnu: webkitgtk: Fix compilation on x86_64.
@ 2015-05-05 17:53 David Hashe
2015-05-05 20:05 ` Ludovic Courtès
0 siblings, 1 reply; 4+ messages in thread
From: David Hashe @ 2015-05-05 17:53 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1.1: Type: text/plain, Size: 138 bytes --]
This patch moves the library install path to lib on x86_64 to pass the
validate-runpath phase. Tested on my local machine.
Thanks,
David
[-- Attachment #1.2: Type: text/html, Size: 194 bytes --]
[-- Attachment #2: 0001-gnu-webkitgtk-Fix-compilation-on-x86_64.patch --]
[-- Type: text/x-patch, Size: 1497 bytes --]
From 65ea73868e3374d56793cde163172ad9749fe3af Mon Sep 17 00:00:00 2001
From: David Hashe <david.hashe@dhashe.com>
Date: Tue, 5 May 2015 01:48:28 -0500
Subject: [PATCH] gnu: webkitgtk: Fix compilation on x86_64.
* gnu/packages/webkit.scm (webkitgtk): Move library install path from lib64 to
lib.
---
gnu/packages/webkit.scm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index e6de8ab..873428c 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -54,10 +55,16 @@
(base32
"1zv030ryfwwp57yzlpr9bgpxcmc64izsxk2vsyd4kjhns9cl88bx"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; no tests
#:build-type "Release" ; turn off debugging symbols to save space
- #:configure-flags '("-DPORT=GTK")))
+ #:configure-flags (list
+ "-DPORT=GTK"
+ (string-append ; uses lib64 by default
+ "-DLIB_INSTALL_DIR="
+ (assoc-ref %outputs "out") "/lib"))
+ #:make-flags '("lib=lib"))) ; uses lib64 by default
(native-inputs
`(("bison" ,bison)
("gettext" ,gnu-gettext)
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: webkitgtk: Fix compilation on x86_64.
2015-05-05 17:53 [PATCH] gnu: webkitgtk: Fix compilation on x86_64 David Hashe
@ 2015-05-05 20:05 ` Ludovic Courtès
2015-05-06 4:54 ` David Hashe
0 siblings, 1 reply; 4+ messages in thread
From: Ludovic Courtès @ 2015-05-05 20:05 UTC (permalink / raw)
To: David Hashe; +Cc: guix-devel
David Hashe <david.hashe@dhashe.com> skribis:
> From 65ea73868e3374d56793cde163172ad9749fe3af Mon Sep 17 00:00:00 2001
> From: David Hashe <david.hashe@dhashe.com>
> Date: Tue, 5 May 2015 01:48:28 -0500
> Subject: [PATCH] gnu: webkitgtk: Fix compilation on x86_64.
>
> * gnu/packages/webkit.scm (webkitgtk): Move library install path from lib64 to
> lib.
Applied.
[...]
> - #:configure-flags '("-DPORT=GTK")))
> + #:configure-flags (list
> + "-DPORT=GTK"
> + (string-append ; uses lib64 by default
> + "-DLIB_INSTALL_DIR="
> + (assoc-ref %outputs "out") "/lib"))
> + #:make-flags '("lib=lib"))) ; uses lib64 by default
Do you know if both are actually needed? I would expect LIB_INSTALL_DIR
to be sufficient.
Thank you!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: webkitgtk: Fix compilation on x86_64.
2015-05-05 20:05 ` Ludovic Courtès
@ 2015-05-06 4:54 ` David Hashe
2015-05-06 7:27 ` Ludovic Courtès
0 siblings, 1 reply; 4+ messages in thread
From: David Hashe @ 2015-05-06 4:54 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
[-- Attachment #1.1: Type: text/plain, Size: 1128 bytes --]
Oops! I tried it with just LIB_INSTALL_DIR, and you are correct. I've
attached a patch fixing that.
David
On Tue, May 5, 2015 at 3:05 PM, Ludovic Courtès <ludo@gnu.org> wrote:
> David Hashe <david.hashe@dhashe.com> skribis:
>
> > From 65ea73868e3374d56793cde163172ad9749fe3af Mon Sep 17 00:00:00 2001
> > From: David Hashe <david.hashe@dhashe.com>
> > Date: Tue, 5 May 2015 01:48:28 -0500
> > Subject: [PATCH] gnu: webkitgtk: Fix compilation on x86_64.
> >
> > * gnu/packages/webkit.scm (webkitgtk): Move library install path from
> lib64 to
> > lib.
>
> Applied.
>
> [...]
>
> > - #:configure-flags '("-DPORT=GTK")))
> > + #:configure-flags (list
> > + "-DPORT=GTK"
> > + (string-append ; uses lib64 by default
> > + "-DLIB_INSTALL_DIR="
> > + (assoc-ref %outputs "out") "/lib"))
> > + #:make-flags '("lib=lib"))) ; uses lib64 by default
>
> Do you know if both are actually needed? I would expect LIB_INSTALL_DIR
> to be sufficient.
>
> Thank you!
>
> Ludo’.
>
[-- Attachment #1.2: Type: text/html, Size: 1768 bytes --]
[-- Attachment #2: 0001-gnu-webkitgtk-Remove-unnecessary-make-flag.patch --]
[-- Type: text/x-patch, Size: 1242 bytes --]
From 3caa6372614cbbf39d06a8d1741958e1bb92be9a Mon Sep 17 00:00:00 2001
From: David Hashe <david.hashe@dhashe.com>
Date: Tue, 5 May 2015 23:49:55 -0500
Subject: [PATCH] gnu: webkitgtk: Remove unnecessary make flag.
* gnu/packages/webkit.scm (webkitgtk): Remove make-flags.
---
gnu/packages/webkit.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 873428c..9692ab0 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -55,7 +55,6 @@
(base32
"1zv030ryfwwp57yzlpr9bgpxcmc64izsxk2vsyd4kjhns9cl88bx"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; no tests
#:build-type "Release" ; turn off debugging symbols to save space
@@ -63,8 +62,7 @@
"-DPORT=GTK"
(string-append ; uses lib64 by default
"-DLIB_INSTALL_DIR="
- (assoc-ref %outputs "out") "/lib"))
- #:make-flags '("lib=lib"))) ; uses lib64 by default
+ (assoc-ref %outputs "out") "/lib"))))
(native-inputs
`(("bison" ,bison)
("gettext" ,gnu-gettext)
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: webkitgtk: Fix compilation on x86_64.
2015-05-06 4:54 ` David Hashe
@ 2015-05-06 7:27 ` Ludovic Courtès
0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2015-05-06 7:27 UTC (permalink / raw)
To: David Hashe; +Cc: guix-devel
David Hashe <david.hashe@dhashe.com> skribis:
> From 3caa6372614cbbf39d06a8d1741958e1bb92be9a Mon Sep 17 00:00:00 2001
> From: David Hashe <david.hashe@dhashe.com>
> Date: Tue, 5 May 2015 23:49:55 -0500
> Subject: [PATCH] gnu: webkitgtk: Remove unnecessary make flag.
>
> * gnu/packages/webkit.scm (webkitgtk): Remove make-flags.
Applied, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-05-06 7:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-05 17:53 [PATCH] gnu: webkitgtk: Fix compilation on x86_64 David Hashe
2015-05-05 20:05 ` Ludovic Courtès
2015-05-06 4:54 ` David Hashe
2015-05-06 7:27 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.