From e2356f44d08f1e9b1db125053384e616c05058f5 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Thu, 15 Jul 2010 17:13:42 +0000 Subject: [PATCH] tinc: fix build on powerpc (closes: #7072), reformat SVN-Revision: 22208 --- net/tinc/Makefile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/net/tinc/Makefile b/net/tinc/Makefile index efd6735d9..67501767f 100644 --- a/net/tinc/Makefile +++ b/net/tinc/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -21,8 +21,6 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -TARGET_CFLAGS+=-std=gnu99 - define Package/tinc SECTION:=net CATEGORY:=Network @@ -37,13 +35,17 @@ define Package/tinc/description encryption to create a secure private network between hosts on the Internet. endef -define Build/Configure - $(call Build/Configure/Default, \ - --with-kernel="$(LINUX_DIR)" \ - --with-zlib="$(STAGING_DIR)/usr" \ - --with-lzo-include="$(STAGING_DIR)/usr/include/lzo" \ - ) -endef +TARGET_CFLAGS += -std=gnu99 + +CONFIGURE_ARGS += \ + --with-kernel="$(LINUX_DIR)" \ + --with-zlib="$(STAGING_DIR)/usr" \ + --with-lzo-include="$(STAGING_DIR)/usr/include/lzo" \ + +# XXX: checking for SHA1_version(), which is a variable, not a function, +# fails on PowerPC, so just override it for now +CONFIGURE_VARS += \ + ac_cv_lib_crypto_SHA1_version="yes" \ define Package/tinc/install $(INSTALL_DIR) $(1)/usr/sbin -- 2.30.2