Re: RFC: Build system hacks for Guix do not belong in 'source'

[Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]


Mark H Weaver writes:

> I think that both the 'ldconfig -> true' hack and the LIBDIR
> substitution should be moved to a build phase for both of these
> packages.

Attached are updated patches, moving the build hacks from snippets to a
build phase.

~~ Ricardo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-zita-alsa-pcmi-set-LIBDIR-to-lib.patch --]
[-- Type: text/x-patch, Size: 1542 bytes --]

From abdbfec11164c61cfdb6fc88ddf9abd2e58aa027 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 4 Mar 2015 11:50:26 +0100
Subject: [PATCH 1/2] gnu: zita-alsa-pcmi: set LIBDIR to "lib".

* gnu/packages/audio.scm (zita-alsa-pcmi)[source, arguments]: Set LIBDIR to
  "lib" in build phase.  Remove snippet.
---
 gnu/packages/audio.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 64bde2e..c440c4a 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1032,11 +1032,7 @@ interface.")
                     version ".tar.bz2"))
               (sha256
                (base32
-                "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9"))
-              (modules '((guix build utils)))
-              (snippet
-               '(substitute* "libs/Makefile"
-                  (("ldconfig") "true")))))
+                "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; no "check" target
@@ -1044,8 +1040,12 @@ interface.")
        #:phases
        (alist-cons-after
         'unpack
-        'enter-directory
-        (lambda _ (chdir "libs"))
+        'fix-makefile
+        (lambda _
+          (substitute* "libs/Makefile"
+            (("ldconfig") "true")
+            (("^LIBDIR =.*") "LIBDIR = lib\n"))
+          (chdir "libs"))
         (alist-cons-after
          'install
          'install-symlink
-- 
2.1.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-clalsadrv-set-LIBDIR-to-lib.patch --]
[-- Type: text/x-patch, Size: 1562 bytes --]

From c114d1fbeda081c13e60a0ec1f776fcf783f1c48 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 4 Mar 2015 11:52:07 +0100
Subject: [PATCH 2/2] gnu: clalsadrv: set LIBDIR to "lib".

* gnu/packages/audio.scm (clalsadrv)[source, arguments]: Set LIBDIR to "lib"
  in build phase.  Remove snippet.
---
 gnu/packages/audio.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index c440c4a..ebbf728 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -244,11 +244,7 @@ plugins are provided.")
                     version ".tar.bz2"))
               (sha256
                (base32
-                "0bsacx3l9065gk8g4137qmz2ij7s9x06aldvacinzlcslw7bd1kq"))
-              (modules '((guix build utils)))
-              (snippet
-               '(substitute* "libs/Makefile"
-                  (("/sbin/ldconfig") "true")))))
+                "0bsacx3l9065gk8g4137qmz2ij7s9x06aldvacinzlcslw7bd1kq"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; no "check" target
@@ -256,8 +252,12 @@ plugins are provided.")
        #:phases
        (alist-cons-after
         'unpack
-        'enter-directory
-        (lambda _ (chdir "libs"))
+        'fix-makefile
+        (lambda _
+          (substitute* "libs/Makefile"
+            (("/sbin/ldconfig") "true")
+            (("^LIBDIR =.*") "LIBDIR = lib\n"))
+          (chdir "libs"))
         (alist-cons-after
          'install
          'install-symlink
-- 
2.1.0