01/02: gnu: lksctp-tools: Fix build of include file.

[guix-commits]

htgoebel pushed a commit to branch master
in repository guix.

commit 3281ba6eae1ead32b5146cfe6af4479dbb72593a
Author: Hartmut Goebel <h.goebel@crazy-compilers.com>
AuthorDate: Sat Apr 3 17:08:10 2021 +0200

    gnu: lksctp-tools: Fix build of include file.
    
    * gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch:
      New file.
    * gnu/local.mk[patches]: Add it.
    * gnu/packages/networking.scm(/lksctp-tools)[source]: Use this patch.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/networking.scm                        |  2 ++
 .../lksctp-tools-1.0.18-fix-header-file-name.patch | 32 ++++++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 8365e19..5c1ce07 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1266,6 +1266,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/libffi-float128-powerpc64le.patch       \
   %D%/packages/patches/libvirt-add-install-prefix.patch        \
   %D%/packages/patches/libziparchive-add-includes.patch                \
+  %D%/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch \
   %D%/packages/patches/localed-xorg-keyboard.patch             \
   %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \
   %D%/packages/patches/kiki-level-selection-crash.patch                \
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 7f8c68e..5fe9ec2 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -448,6 +448,8 @@ performance across unpredictable networks, such as the 
Internet.")
          (url "https://github.com/sctp/lksctp-tools";)
          (commit (string-append "v" version))))
        (file-name (git-file-name name version))
+       (patches
+        (search-patches "lksctp-tools-1.0.18-fix-header-file-name.patch"))
        (sha256
         (base32 "1x4fwzrlzvfa3vcpja97m8w5g9ir2zrh4zs7zksminrnmdrs0dsr"))))
     (build-system gnu-build-system)
diff --git 
a/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch 
b/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch
new file mode 100644
index 0000000..1ebe6c8
--- /dev/null
+++ b/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch
@@ -0,0 +1,32 @@
+From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001
+From: Xin Long <lucien.xin@gmail.com>
+Date: Fri, 24 Aug 2018 01:13:32 +0800
+Subject: [PATCH] build: fix netinet/sctp.h not to be installed
+
+After libcnetinet_HEADERS was set to sctp.h.in, netinet/sctp.h can
+no longer be installed into ${includedir}.
+
+Since "AC_CONFIG_HEADERS([src/include/netinet/sctp.h])" is already
+added into configure.ac, there's no need to generate sctp.h by
+automake.
+
+So we simply set libcnetinet_HEADERS back to sctp.h.
+
+Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup")
+Signed-off-by: Xin Long <lucien.xin@gmail.com>
+Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
+---
+ src/include/netinet/Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am
+index ca0aac2..965db8c 100644
+--- a/src/include/netinet/Makefile.am
++++ b/src/include/netinet/Makefile.am
+@@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet
+ # API.
+ include_HEADERS =
+ 
+-libcnetinet_HEADERS = sctp.h.in
+-BUILT_SOURCES = sctp.h
++libcnetinet_HEADERS = sctp.h