Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kea: Don't install to STAGING_DIR_HOST

Browse source 
STAGING_DIR_HOST is for packages under tools/ , not host packages.

Reorganized Makefile for consistency between packages.

Added PKG/HOST_BUILD_PARALLEL for faster compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-06-20 11:50:06 -07:00
parent 7d7580615f
commit d93fd61d62
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
1 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
net/kea/Makefile
View file

@ -10,26 +10,27 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=kea PKG_NAME:=kea
PKG_VERSION:=1.5.0 PKG_VERSION:=1.5.0
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_MAINTAINER:=BangLang Huang<banglang.huang@foxmail.com>, Rosy Song<rosysong@rosinson.com>
PKG_BUILD_DEPENDS:=boost log4cplus kea/host
HOST_BUILD_DEPENDS:=boost boost/host log4cplus/host
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION)/ PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION)
PKG_HASH:=edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec PKG_HASH:=edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec
PKG_INSTALL:=1 PKG_MAINTAINER:=BangLang Huang<banglang.huang@foxmail.com>, Rosy Song<rosysong@rosinson.com>
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=MPL-2.0 PKG_LICENSE:=MPL-2.0
PKG_LICENSE_FILES:=COPYING
HOST_BUILD_DEPENDS:=boost/host log4cplus/host openssl
PKG_BUILD_DEPENDS:=kea/host
HOST_BUILD_PARALLEL:=1
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
define Package/kea/Default define Package/kea/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
@ -97,32 +98,33 @@ define Package/kea-perfdhcp
DEPENDS:=+kea-libs DEPENDS:=+kea-libs
endef endef
HOST_CONFIGURE_ARGS += \
--with-boost-include="$(STAGING_DIR_HOSTPKG)" \
--with-log4cplus="$(STAGING_DIR_HOSTPKG)" \
--with-openssl="$(STAGING_DIR)/usr" \
--enable-boost-headers-only \
--enable-static-link
HOST_LDFLAGS += \
-Wl,--gc-sections,--as-needed
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--with-boost-include="$(STAGING_DIR)/usr" \
--with-log4cplus="$(STAGING_DIR)/usr" \ --with-log4cplus="$(STAGING_DIR)/usr" \
--with-openssl="$(STAGING_DIR)/usr" \ --with-openssl="$(STAGING_DIR)/usr" \
--without-pic \
$(if $(CONFIG_PACKAGE_kea-perfdhcp),--enable-perfdhcp,) $(if $(CONFIG_PACKAGE_kea-perfdhcp),--enable-perfdhcp,)
CONFIGURE_VARS += \ CONFIGURE_VARS += \
cross_compiling="yes" cross_compiling="yes"
HOST_CONFIGURE_ARGS += \
--enable-static-link \
--enable-boost-headers-only \
--with-log4cplus="$(STAGING_DIR_HOSTPKG)" \
--with-boost-include="$(STAGING_DIR)/usr/include" \
--with-openssl="$(STAGING_DIR)/usr" \
--without-pic
HOST_LDFLAGS += \
-Wl,--gc-sections,--as-needed
TARGET_CXXFLAGS += \ TARGET_CXXFLAGS += \
$(FPIC) \ $(FPIC) \
-fdata-sections \ -fdata-sections \
-ffunction-sections -ffunction-sections
TARGET_LDFLAGS += \ TARGET_LDFLAGS += \
-Wl,--gc-sections,--as-needed -Wl,--gc-sections,--as-needed
# Only compile the kea-msg-compiler which we need for # Only compile the kea-msg-compiler which we need for
# package compilation # package compilation