unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: David Hashe <david.hashe@dhashe.com>
To: guix-devel@gnu.org
Subject: [PATCH] gnu: webkitgtk: Fix compilation on x86_64.
Date: Tue, 5 May 2015 12:53:48 -0500	[thread overview]
Message-ID: <CAAn-YqHzRxjDi8fE+FmrG=oYYEtkuRwvjSWxQgGzXgu9nSMrjg@mail.gmail.com> (raw)


[-- 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


             reply	other threads:[~2015-05-05 17:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-05 17:53 David Hashe [this message]
2015-05-05 20:05 ` [PATCH] gnu: webkitgtk: Fix compilation on x86_64 Ludovic Courtès
2015-05-06  4:54   ` David Hashe
2015-05-06  7:27     ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAAn-YqHzRxjDi8fE+FmrG=oYYEtkuRwvjSWxQgGzXgu9nSMrjg@mail.gmail.com' \
    --to=david.hashe@dhashe.com \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).