guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: f2fs-tools-static: Fix build after f2fs-tool


From: guix-commits
Subject: branch master updated: gnu: f2fs-tools-static: Fix build after f2fs-tools update.
Date: Mon, 28 Dec 2020 09:03:41 -0500

This is an automated email from the git hooks/post-receive script.

dannym pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new a099d83  gnu: f2fs-tools-static: Fix build after f2fs-tools update.
a099d83 is described below

commit a099d833af3afe69c50dbd016e9ed117462ca7ef
Author: Danny Milosavljevic <dannym@scratchpost.org>
AuthorDate: Mon Dec 28 15:00:27 2020 +0100

    gnu: f2fs-tools-static: Fix build after f2fs-tools update.
    
    Fixes <https://bugs.gnu.org/45494>.
    
    * gnu/packages/linux.scm (f2fs-tools-static)[arguments]<#:configure-flags>:
    Modify libuuid_CFLAGS, libblkid_CFLAGS.
---
 gnu/packages/linux.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 45a105b..99ad2b4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5127,9 +5127,10 @@ disks and SD cards.  This package provides the userland 
utilities.")
        (let ((libuuid-static (assoc-ref %build-inputs "libuuid:static"))
              (libuuid (assoc-ref %build-inputs "libuuid")))
          (list
-          (string-append "libuuid_CFLAGS=-I" libuuid "/include")
+          (string-append "libuuid_CFLAGS=-I" libuuid "/include/uuid")
           (string-append "libuuid_LIBS=-L" libuuid-static "/lib -luuid")
-          (string-append "libblkid_CFLAGS=-I" libuuid "/include")
+          (string-append "libblkid_CFLAGS=-I" libuuid "/include/uuid "
+                         "-I" libuuid "/include/blkid")
           (string-append "libblkid_LIBS=-L" libuuid-static "/lib -lblkid")))
        #:disallowed-references (,util-linux)
        #:phases



reply via email to

[Prev in Thread] Current Thread [Next in Thread]