From 2f10dde0c5e45267a65cef586e85722b7ef4752d Mon Sep 17 00:00:00 2001 From: jow Date: Sun, 5 Feb 2012 16:25:55 +0000 Subject: [PATCH] [packages_10.03.2] umurmur: merge r29891 git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30274 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/umurmur/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/umurmur/Makefile b/net/umurmur/Makefile index 366ffdb..f3fe5f2 100644 --- a/net/umurmur/Makefile +++ b/net/umurmur/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2011 OpenWrt.org +# Copyright (C) 2009-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=umurmur PKG_VERSION:=0.2.8 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://umurmur.googlecode.com/files/ @@ -82,13 +82,13 @@ endef Package/umurmur-polarssl/install = $(Package/umurmur-openssl/install) ifeq ($(BUILD_VARIANT),openssl) - TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include - TARGET_LDFLAGS += -lcrypto -lssl + CONFIGURE_ARGS += \ + --with-ssl=openssl endif ifeq ($(BUILD_VARIANT),polarssl) - TARGET_CFLAGS += -DUSE_POLARSSL -I$(STAGING_DIR)/usr/include - TARGET_LDFLAGS += -lpolarssl + CONFIGURE_ARGS += \ + --with-ssl=polarssl endif $(eval $(call BuildPackage,umurmur-openssl)) -- 2.11.0