From 5b5bf5ea0b19982db9a0ca970f227f97f1c60ea6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 11 Feb 2014 08:06:21 +0100
Subject: disable for musl, needs more investigation

---
 package/ipsec-tools/Makefile                       |  6 ++++--
 package/ipsec-tools/patches/patch-ltmain_sh        | 11 ----------
 .../patches/patch-src_include-glibc_Makefile_in    | 24 ----------------------
 3 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 package/ipsec-tools/patches/patch-ltmain_sh
 delete mode 100644 package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in

(limited to 'package/ipsec-tools')

diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index f38332834..781aefb6f 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ipsec-tools
-PKG_VERSION:=		0.8.0
+PKG_VERSION:=		0.8.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b79aae3055a51f8de5c0f1b8ca6cf619
+PKG_MD5SUM:=		d38b39f291ba2962387c3232e7335dd8
 PKG_DESCR:=		IPsec management tools
 PKG_SECTION:=		net/security
 PKG_BUILDDEP:=		openssl flex
@@ -14,6 +14,7 @@ PKG_DEPENDS:=		libopenssl
 PKG_URL:=		http://ipsec-tools.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ipsec-tools/}
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 PKG_CFLINE_IPSEC_TOOLS:=depends on !ADK_TOOLCHAIN_ONLY
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
@@ -25,6 +26,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_CPPFLAGS+=	-I${LINUX_DIR}/include
 CONFIGURE_ARGS+=	--with-kernel-headers="${LINUX_DIR}/include" \
 			--without-readline \
 			--disable-security-context \
diff --git a/package/ipsec-tools/patches/patch-ltmain_sh b/package/ipsec-tools/patches/patch-ltmain_sh
deleted file mode 100644
index 9771c2407..000000000
--- a/package/ipsec-tools/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ipsec-tools-0.8.0.orig/ltmain.sh	2011-03-18 14:27:39.000000000 +0100
-+++ ipsec-tools-0.8.0/ltmain.sh	2011-03-31 13:16:42.511821748 +0200
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in
deleted file mode 100644
index f594f5d92..000000000
--- a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in
+++ /dev/null
@@ -1,24 +0,0 @@
---- ipsec-tools-0.8.0.orig/src/include-glibc/Makefile.in	2011-03-18 14:27:40.000000000 +0100
-+++ ipsec-tools-0.8.0/src/include-glibc/Makefile.in	2013-07-17 14:35:36.000000000 +0200
-@@ -183,7 +183,7 @@ EXTRA_DIST = \
-   netinet/ipsec.h \
-   sys/queue.h
- 
--DISTCLEANFILES = .includes linux
-+DISTCLEANFILES = linux
- all: all-am
- 
- .SUFFIXES:
-@@ -370,11 +370,7 @@ uninstall-am:
- 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
- 
- 
--.includes: ${top_builddir}/config.status
--	ln -sf $(KERNEL_INCLUDE)/linux
--	touch .includes
--
--all: .includes
-+all:
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-- 
cgit v1.2.3