From f478209bce71ad6b6f24cdaad4e9b8ac1244094c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 7 Apr 2019 15:43:07 -0700 Subject: [PATCH] kea: Specify OpenSSL location Some buildbots are failing on this. Refreshed patches. Replace -fPIC with $(FPIC) Signed-off-by: Rosen Penev --- net/kea/Makefile | 7 +++++-- net/kea/patches/001-fix-cross-compile.patch | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index e66aedd627..36c035db95 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -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, Rosy Song 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 diff --git a/net/kea/patches/001-fix-cross-compile.patch b/net/kea/patches/001-fix-cross-compile.patch index 40a47501a0..d3a1521a95 100644 --- a/net/kea/patches/001-fix-cross-compile.patch +++ b/net/kea/patches/001-fix-cross-compile.patch @@ -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) -- 2.30.2