kea: Specify OpenSSL location 8617/head
authorRosen Penev <rosenp@gmail.com>
Sun, 7 Apr 2019 22:43:07 +0000 (15:43 -0700)
committerRosen Penev <rosenp@gmail.com>
Sun, 7 Apr 2019 22:49:43 +0000 (15:49 -0700)
Some buildbots are failing on this.

Refreshed patches.

Replace -fPIC with $(FPIC)

Signed-off-by: Rosen Penev <rosenp@gmail.com>
net/kea/Makefile
net/kea/patches/001-fix-cross-compile.patch

index e66aedd62705049e4bae6d9bc8c3c4e220f9eafb..36c035db9527bb42d0d2cfaca9d3fcecec40c4ec 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kea
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 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
@@ -99,6 +99,7 @@ endef
 
 CONFIGURE_ARGS += \
        --with-log4cplus="$(STAGING_DIR)/usr" \
+       --with-openssl="$(STAGING_DIR)/usr" \
        $(if $(CONFIG_PACKAGE_kea-perfdhcp),--enable-perfdhcp,)
 
 CONFIGURE_VARS += \
@@ -108,12 +109,14 @@ HOST_CONFIGURE_ARGS += \
        --enable-static-link \
        --enable-boost-headers-only \
        --with-log4cplus="$(STAGING_DIR_HOSTPKG)" \
-       --with-boost-include="$(STAGING_DIR)/usr/include"
+       --with-boost-include="$(STAGING_DIR)/usr/include" \
+       --without-pic
 
 HOST_LDFLAGS += \
                -Wl,--gc-sections,--as-needed
 
 TARGET_CXXFLAGS += \
+               $(FPIC) \
                -fdata-sections \
                -ffunction-sections
 
index 40a47501a04825d4d5afd1424b7fc3c5e4415ab5..d3a1521a954a762643c116943736b1664a511b75 100644 (file)
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -594,10 +594,10 @@ AC_TRY_COMPILE([
+@@ -580,10 +580,10 @@ AC_TRY_COMPILE([
          AC_MSG_RESULT(no))
  
  AC_MSG_CHECKING(for usuable C++11 regex)