diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-12-18 17:11:19 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-18 17:11:36 +0000 |
| commit | 6138f3398778cef27660947cd8fcb494703727e5 (patch) | |
| tree | b2ea47d7ba815feefc565e44da4160209eafda0a | |
| parent | 690804938f0953d9af0781ce92b01939f2d60c15 (diff) | |
| download | aports-6138f3398778cef27660947cd8fcb494703727e5.tar.bz2 aports-6138f3398778cef27660947cd8fcb494703727e5.tar.xz | |
main/libnfnetlink: additional headers fix (under musl)
| -rw-r--r-- | main/libnfnetlink/APKBUILD | 11 | ||||
| -rw-r--r-- | main/libnfnetlink/fix-includes.patch | 10 | ||||
| -rw-r--r-- | main/libnfnetlink/musl-fix-includes.patch | 20 |
3 files changed, 26 insertions, 15 deletions
diff --git a/main/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD index c724700cbf..4ec7b678cd 100644 --- a/main/libnfnetlink/APKBUILD +++ b/main/libnfnetlink/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libnfnetlink pkgver=1.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="low-level library for netfilter related kernel/userspace communication" url="http://www.netfilter.org/projects/libnfnetlink/" arch="all" @@ -11,7 +11,8 @@ depends="" makedepends="" subpackages="$pkgname-dev" source="http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-$pkgver.tar.bz2 - fix-includes.patch" + musl-fix-includes.patch + " _builddir="$srcdir/$pkgname-$pkgver" @@ -45,8 +46,8 @@ package() { rm "$pkgdir"/usr/lib/*.la } md5sums="98927583d2016a9fb1936fed992e2c5e libnfnetlink-1.0.1.tar.bz2 -e441bfc59a021e3871da9300fccf2b36 fix-includes.patch" +0217b463039b4970578653a157a7b71e musl-fix-includes.patch" sha256sums="f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a libnfnetlink-1.0.1.tar.bz2 -78a20a154e7e36f3f2c974705d4db488011d2fb532234f59dee7453efb84bdee fix-includes.patch" +dfa76f1ebc8ad475266176f7a2c4835c60419df727054bb2095008e356bd91c6 musl-fix-includes.patch" sha512sums="2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104 libnfnetlink-1.0.1.tar.bz2 -d2d5fdbca911e34b03d06de461921a1a65d3b7819fb07a6376c91411dbc2677f0299eb4fd02985e6879ad6b109232b0a873d4e6ff88708651ea16c9c5df35720 fix-includes.patch" +fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41 musl-fix-includes.patch" diff --git a/main/libnfnetlink/fix-includes.patch b/main/libnfnetlink/fix-includes.patch deleted file mode 100644 index f4a5674ee2..0000000000 --- a/main/libnfnetlink/fix-includes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink.h -+++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h -@@ -1,6 +1,6 @@ - #ifndef _NFNETLINK_H - #define _NFNETLINK_H --#include <linux/types.h> -+#include <sys/types.h> - #include <libnfnetlink/linux_nfnetlink_compat.h> - - enum nfnetlink_groups { diff --git a/main/libnfnetlink/musl-fix-includes.patch b/main/libnfnetlink/musl-fix-includes.patch new file mode 100644 index 0000000000..04aef8a4de --- /dev/null +++ b/main/libnfnetlink/musl-fix-includes.patch @@ -0,0 +1,20 @@ +--- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink.h ++++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h +@@ -1,6 +1,6 @@ + #ifndef _NFNETLINK_H + #define _NFNETLINK_H +-#include <linux/types.h> ++#include <sys/types.h> + #include <libnfnetlink/linux_nfnetlink_compat.h> + + enum nfnetlink_groups { +--- libnfnetlink-1.0.1.orig/include/libnfnetlink/libnfnetlink.h ++++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h +@@ -15,6 +15,7 @@ + #define aligned_u64 unsigned long long __attribute__((aligned(8))) + #endif + ++#include <sys/types.h> + #include <sys/socket.h> /* for sa_family_t */ + #include <linux/netlink.h> + #include <libnfnetlink/linux_nfnetlink.h> |