afalg_engine: fix ENGINES location, zero-copy
authorEneas U de Queiroz <cotequeiroz@gmail.com>
Thu, 16 Jan 2020 18:21:21 +0000 (15:21 -0300)
committerRosen Penev <rosenp@gmail.com>
Fri, 17 Jan 2020 23:37:26 +0000 (15:37 -0800)
Use a fixed ENGINES_DIR location, instead of trying to read it from the
openssl Makefile.

It also fixes the zero-copy config option not being passed down to the
cmake options.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
(cherry-picked from 6a5f7920e96ca8718129041c048d638c62e65959)

libs/afalg_engine/Makefile

index 2ec653edc16c4f8c4f96a83b7756073b48814a3e..9da969a4367d4f59c61c39c96e59baf302b7131e 100644 (file)
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=afalg_engine
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/cotequeiroz/afalg_engine/archive/v$(PKG_VERSION)
@@ -22,10 +22,7 @@ PKG_CONFIG_DEPENDS:= CONFIG_AFALG_ZERO_COPY
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-$(eval $(shell grep "^ENGINES_DIR" "$(TOPDIR)/package/libs/openssl/Makefile"))
-ifeq ($(ENGINES_DIR),)
-  ENGINES_DIR:=engines-1.1
-endif
+ENGINES_DIR:=engines-1.1
 
 define Package/libopenssl-afalg_sync
     SECTION:=libs
@@ -59,7 +56,7 @@ endef
 
 CMAKE_OPTIONS += \
        -DOPENSSL_ENGINES_DIR=/usr/lib/$(ENGINES_DIR) \
-       -DUSE_ZERO_COPY=$(if $(AFALG_ZERO_COPY),ON,OFF)
+       -DUSE_ZERO_COPY=$(if $(CONFIG_AFALG_ZERO_COPY),ON,OFF)
 
 define Package/libopenssl-afalg_sync/install
        $(INSTALL_DIR) $(1)/usr/lib/$(ENGINES_DIR)