Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FS#2485 - [19.07-SNAPSHOT SDK] libustream-openssl links against mbedtls #7293

Closed
openwrt-bot opened this issue Sep 8, 2019 · 2 comments
Closed
Labels

Comments

@openwrt-bot
Copy link

cshoredaniel:

Using the Ath79 19.07-SNAPSHOT SDK built Sep 6, I get the following with a clean build:

Package libustream-openssl is missing dependencies for the following libraries:
libmbedcrypto.so.3
libmbedtls.so.12
libmbedx509.so.0
make[3]: *** [Makefile:79: /home/daniel/Build/openwrt-sdk-19.07-SNAPSHOT-ath79-generic_gcc-7.4.0_musl.Linux-x86_64/bin/packages/mips_24kc/base/libustream-openssl20150806_2019-08-17-e8f9c22d-1_mips_24kc.ipk] Error 1
time: package/feeds/base/ustream-ssl/openssl/compile#0.52#0.19#1.28

I have all libustream packages enabled for build as I sometimes use mbedtls and sometimes openssl.

@openwrt-bot
Copy link
Author

cshoredaniel:

The following Makefile fixes the issue.

include $(TOPDIR)/rules.mk

PKG_NAME:=ustream-ssl
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git
PKG_SOURCE_DATE:=2019-08-17
PKG_SOURCE_VERSION:=e8f9c22d02fccde1d992f324280fb9966d3b4be6
PKG_MIRROR_HASH:=b735fc259337c0ea3cc93fc05ad9151b841a8f85a4168f37b1d20979415d5a19
CMAKE_INSTALL:=1

PKG_LICENSE:=ISC
PKG_LICENSE_FILES:=

PKG_MAINTAINER:=Felix Fietkau nbd@nbd.name

PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk

define Package/libustream/default
SECTION:=libs
CATEGORY:=Libraries
TITLE:=ustream SSL Library
DEPENDS:=+libubox
ABI_VERSION:=20150806
endef

define Package/libustream-openssl
$(Package/libustream/default)
TITLE += (openssl)
DEPENDS += +PACKAGE_libustream-openssl:libopenssl
VARIANT:=openssl
endef

define Package/libustream-wolfssl
$(Package/libustream/default)
TITLE += (wolfssl)
DEPENDS += +PACKAGE_libustream-wolfssl:libwolfssl
VARIANT:=wolfssl
endef

define Package/libustream-mbedtls
$(Package/libustream/default)
TITLE += (mbedtls)
DEPENDS += +libmbedtls
VARIANT:=mbedtls
DEFAULT_VARIANT:=1
endef

ifeq ($(BUILD_VARIANT),wolfssl)
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/cyassl -DHAVE_SNI
CMAKE_OPTIONS += -DCYASSL=on
endif
ifeq ($(BUILD_VARIANT),mbedtls)
CMAKE_OPTIONS += -DMBEDTLS=on
endif

define Package/libustream/default/install
$(INSTALL_DIR) $(1)/lib/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libustream-ssl.so $(1)/lib/
endef

Package/libustream-openssl/install = $(Package/libustream/default/install)
Package/libustream-wolfssl/install = $(Package/libustream/default/install)
Package/libustream-mbedtls/install = $(Package/libustream/default/install)

$(eval $(call BuildPackage,libustream-mbedtls))
$(eval $(call BuildPackage,libustream-wolfssl))
$(eval $(call BuildPackage,libustream-openssl))

@openwrt-bot
Copy link
Author

cshoredaniel:

This appears to have been fixed in the 2019-09-07 19.07-SNAPSHOT build.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

1 participant