Browse Source

disable libcap

Waldemar Brodkorb 12 years ago
parent
commit
7082351401
2 changed files with 28 additions and 0 deletions
  1. 3 0
      package/miredo/Makefile
  2. 25 0
      package/miredo/patches/patch-configure_ac

+ 3 - 0
package/miredo/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		5bcdbaced54f40b6cb1e9c9a8dbac411
 PKG_MD5SUM:=		5bcdbaced54f40b6cb1e9c9a8dbac411
 PKG_DESCR:=		A Teredo client and relay daemon
 PKG_DESCR:=		A Teredo client and relay daemon
 PKG_SECTION:=		ipv6
 PKG_SECTION:=		ipv6
+PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.remlab.net/
 PKG_URL:=		http://www.remlab.net/
 PKG_SITES:=		http://www.remlab.net/files/miredo/
 PKG_SITES:=		http://www.remlab.net/files/miredo/
 
 
@@ -21,9 +22,11 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 
+AUTOTOOL_STYLE:=	autoreconf
 TARGET_CFLAGS+=		-std=gnu99
 TARGET_CFLAGS+=		-std=gnu99
 CONFIGURE_ENV+=		ac_cv_file__proc_self_maps=yes
 CONFIGURE_ENV+=		ac_cv_file__proc_self_maps=yes
 CONFIGURE_ARGS+=	--without-Judy \
 CONFIGURE_ARGS+=	--without-Judy \
+			--without-libcap \
 			--enable-teredo-client \
 			--enable-teredo-client \
 			--enable-miredo-user=root
 			--enable-miredo-user=root
 
 

+ 25 - 0
package/miredo/patches/patch-configure_ac

@@ -0,0 +1,25 @@
+--- miredo-1.2.6.orig/configure.ac	2013-05-23 17:51:41.000000000 +0200
++++ miredo-1.2.6/configure.ac	2013-11-08 16:09:54.000000000 +0100
+@@ -149,12 +149,17 @@ LIBS="$LIBS_save"
+ AS_MESSAGE([checking optional features...])
+ 
+ # POSIX capabilities
++AC_ARG_WITH(libcap,
++	    [AS_HELP_STRING(--with-libcap,
++			    [use POSIX capabilities (default auto)])])
+ LIBCAP=""
+-AC_CHECK_HEADERS([sys/capability.h], [
+-	AC_CHECK_LIB(cap, cap_set_proc, [
+-		LIBCAP="-lcap"
+-		AC_DEFINE(HAVE_LIBCAP, 1,
+-			  [Define to 1 if you have the `cap' library (-lcap).])
++AS_IF([test "x${with_libcap}" != "xno"], [
++	AC_CHECK_HEADERS([sys/capability.h], [
++		AC_CHECK_LIB(cap, cap_set_proc, [
++			LIBCAP="-lcap"
++			AC_DEFINE(HAVE_LIBCAP, 1,
++				  [Define to 1 if you have the `cap' library (-lcap).])
++		])
+ 	])
+ ])
+ AC_SUBST(LIBCAP)