diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/networking.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch | 32 |
3 files changed, 2 insertions, 37 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 8355a208ea..792ebac1e1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1278,7 +1278,6 @@ 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 6e2128aa12..3da10a2990 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -440,7 +440,7 @@ performance across unpredictable networks, such as the Internet.") (define-public lksctp-tools (package (name "lksctp-tools") - (version "1.0.18") + (version "1.0.19") (source (origin (method git-fetch) @@ -449,10 +449,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")))) + (base32 "1jfq58j365mlgssavyw5wcal42n0xjkr40vmj9b8w265wgs28j20")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) 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 deleted file mode 100644 index 1ebe6c803d..0000000000 --- a/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 |