diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-15 15:52:29 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-15 15:52:29 +0100 |
| commit | 4f157056c307ae7d5d0cbd4fa35ffeb2916cd2e0 (patch) | |
| tree | 93e8411b288ab46e3e993a1a2f0784255a5fc803 /package/openvpn | |
| parent | 0c0e05a071067aa433b3cf13bd982543d9ad7d17 (diff) | |
more Darwin compat fixes, add java as build dependency check for xbmc
Diffstat (limited to 'package/openvpn')
| -rw-r--r-- | package/openvpn/Makefile | 3 | ||||
| -rw-r--r-- | package/openvpn/patches/patch-configure_ac | 31 |
2 files changed, 34 insertions, 0 deletions
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 9222a54ff..e3a5e4ac0 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 06e5f93dbf13f2c19647ca15ffc23ac1 PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net/security +PKG_BUILDDEP:= autotool PKG_DEPENDS:= kmod-tun ip PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ @@ -35,6 +36,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf + ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),) CONFIGURE_ARGS+= --enable-lzo else diff --git a/package/openvpn/patches/patch-configure_ac b/package/openvpn/patches/patch-configure_ac new file mode 100644 index 000000000..c0a43dae4 --- /dev/null +++ b/package/openvpn/patches/patch-configure_ac @@ -0,0 +1,31 @@ +--- openvpn-2.3.2.orig/configure.ac 2013-05-31 14:00:25.000000000 +0200 ++++ openvpn-2.3.2/configure.ac 2014-02-15 14:45:30.000000000 +0100 +@@ -353,19 +353,13 @@ AC_PROG_MAKE_SET + + AC_ARG_VAR([IFCONFIG], [full path to ipconfig utility]) + AC_ARG_VAR([ROUTE], [full path to route utility]) +-AC_ARG_VAR([IPROUTE], [full path to ip utility]) + AC_ARG_VAR([NETSTAT], [path to netstat utility]) # tests + AC_ARG_VAR([MAN2HTML], [path to man2html utility]) + AC_ARG_VAR([GIT], [path to git utility]) +-AC_PATH_PROGS([IFCONFIG], [ifconfig],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) +-AC_PATH_PROGS([ROUTE], [route],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) +-AC_PATH_PROGS([IPROUTE], [ip],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) + AC_CHECK_PROGS([NETSTAT], [netstat], [netstat], [$PATH:/usr/local/sbin:/usr/sbin:/sbin:/etc]) # tests + AC_CHECK_PROGS([MAN2HTML], [man2html]) + AC_CHECK_PROGS([GIT], [git]) # optional +-AC_DEFINE_UNQUOTED([IFCONFIG_PATH], ["$IFCONFIG"], [Path to ifconfig tool]) +-AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["$IPROUTE"], [Path to iproute tool]) +-AC_DEFINE_UNQUOTED([ROUTE_PATH], ["$ROUTE"], [Path to route tool]) ++AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["/sbin"], [Path to iproute tool]) + + # + # Libtool +@@ -982,7 +976,6 @@ else + fi + + if test "${enable_iproute2}" = "yes"; then +- test -z "${IPROUTE}" && AC_MSG_ERROR([ip utility is required but missing]) + AC_DEFINE([ENABLE_IPROUTE], [1], [enable iproute2 support]) + else + if test "${WIN32}" != "yes"; then |