X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1d3cff733d7f863871da68a81aeb52729dc314d4..c3360bcbb3ee920a86c38de88b355bdbfd70de92:/package/openswan/Makefile diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 18ea6af9f..1fd2e20af 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -10,13 +10,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=openswan -PKG_VERSION:=2.4.7 +PKG_VERSION:=2.4.8 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openswan.org/download -PKG_MD5SUM:=70f22e8adc39e07a165f75eccb7cd079 -PKG_CAT:=zcat +PKG_MD5SUM:=918cc56ccf8e5d14cd2047e47450b34a include $(INCLUDE_DIR)/package.mk @@ -31,7 +30,7 @@ define Package/openswan $(call Package/openswan/Default) SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-openswan +libgmp + DEPENDS:=+kmod-openswan +libgmp +ip TITLE+= (daemon) DESCRIPTION+=\\\ \\\ @@ -55,7 +54,7 @@ PKG_MAKE_OPTS:= \ KERNELSRC="$(LINUX_DIR)" \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" \ + USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \ IPSECDIR="/usr/lib/ipsec" \ INC_USRLOCAL="/usr" \ @@ -63,7 +62,7 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ $(PKG_MAKE_OPTS) \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ programs module install endef