diff options
author | Timo Teräs <timo.teras@iki.fi> | 2013-10-28 14:34:55 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2013-10-28 14:34:55 +0000 |
commit | 42349810269b8e88e293ca8808c45e8367302d69 (patch) | |
tree | 7b9ce4e7649175e053d55a2feb063b3664fcc854 | |
parent | 448c51ff5279c72a2f9c7381d724540537f1ffd4 (diff) | |
download | aports-42349810269b8e88e293ca8808c45e8367302d69.tar.bz2 aports-42349810269b8e88e293ca8808c45e8367302d69.tar.xz |
main/dhcpcd: fix musl build
-rw-r--r-- | main/dhcpcd/APKBUILD | 13 | ||||
-rw-r--r-- | main/dhcpcd/fix-includes.patch | 48 |
2 files changed, 61 insertions, 0 deletions
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD index 4c0ee7234c..b51bbd12d0 100644 --- a/main/dhcpcd/APKBUILD +++ b/main/dhcpcd/APKBUILD @@ -12,8 +12,18 @@ makedepends= install= subpackages="$pkgname-doc" source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2 + fix-includes.patch dhcpcd.initd" +prepare() { + cd "$srcdir/$pkgname-$pkgver" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + build() { cd "$srcdir/$pkgname-$pkgver" ./configure \ @@ -32,8 +42,11 @@ package() { } md5sums="6070040c57492925af9ac6aed980de2a dhcpcd-6.1.0.tar.bz2 +c5d3c2f281e877e83b0dba3b51136276 fix-includes.patch ecbd807cf3f87d7c5b6095bf63f26894 dhcpcd.initd" sha256sums="71735bcc2e740f37865a985fe32eaa9da5bf557e8b74b214d8099cac878cab64 dhcpcd-6.1.0.tar.bz2 +18dfb95088bafc86603d8a8df1d21d8ebd24fdddf9a7517e50744f8bd1023f95 fix-includes.patch 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492 dhcpcd.initd" sha512sums="87d1512a19660484107ecf5d031ba2755837d381165fc854bfb9460ee5f852bac53423c5c833c765f4ab9d698fcaacd350f16ff8f6173238800ec167a7672874 dhcpcd-6.1.0.tar.bz2 +63315419049b6de0177ba355f74576bb0ba7ae12cc4db52a477c3b2d51502535666d83895eeb442f212cd89f8f9046fcad90d6a0d50a79a7027efb3fab0ee852 fix-includes.patch 0a188b67f0641a480ac6d3cf6a634dddc4b72b1b9b47df33b05fba5d802693dd88e0cece0bfe9b641009c03022c620595b1ce35cd53d5024ee87f4c81e9acf63 dhcpcd.initd" diff --git a/main/dhcpcd/fix-includes.patch b/main/dhcpcd/fix-includes.patch new file mode 100644 index 0000000000..602825d4f6 --- /dev/null +++ b/main/dhcpcd/fix-includes.patch @@ -0,0 +1,48 @@ +--- dhcpcd-6.1.0.orig/common.c ++++ dhcpcd-6.1.0/common.c +@@ -30,8 +30,6 @@ + # define _GNU_SOURCE + #endif + +-#include <sys/cdefs.h> +- + #ifdef __APPLE__ + # include <mach/mach_time.h> + # include <mach/kern_return.h> +--- dhcpcd-6.1.0.orig/dhcp6.c ++++ dhcpcd-6.1.0/dhcp6.c +@@ -31,10 +31,6 @@ + #include <sys/utsname.h> + + #include <netinet/in.h> +-#ifdef __linux__ +-# define _LINUX_IN6_H +-# include <linux/ipv6.h> +-#endif + + #include <ctype.h> + #include <errno.h> +--- dhcpcd-6.1.0.orig/dhcpcd.c ++++ dhcpcd-6.1.0/dhcpcd.c +@@ -48,6 +48,7 @@ + #include <string.h> + #include <syslog.h> + #include <unistd.h> ++#include <fcntl.h> + #include <time.h> + + #include "arp.h" +--- dhcpcd-6.1.0.orig/ipv6nd.c ++++ dhcpcd-6.1.0/ipv6nd.c +@@ -33,11 +33,6 @@ + #include <netinet/ip6.h> + #include <netinet/icmp6.h> + +-#ifdef __linux__ +-# define _LINUX_IN6_H +-# include <linux/ipv6.h> +-#endif +- + #include <errno.h> + #include <stddef.h> + #include <stdlib.h> |