From 531d608ecfabfe14446778f2f8d204bfa6234325 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 22 Oct 2015 17:36:25 +1100 Subject: vamp-plugin-sdk: use MAKE_SHARED_FROM_STATIC for shared build --- src/vamp-plugin-sdk.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/vamp-plugin-sdk.mk b/src/vamp-plugin-sdk.mk index df09b4c..81f4ea8 100644 --- a/src/vamp-plugin-sdk.mk +++ b/src/vamp-plugin-sdk.mk @@ -22,8 +22,7 @@ define $(PKG)_BUILD LD='$(TARGET)-ld' \ AR='$(TARGET)-ar' \ RANLIB='$(TARGET)-ranlib' \ - DYNAMIC_LDFLAGS='-static-libgcc -shared -Wl,-Bsymbolic' \ - sdk$(if $(BUILD_STATIC),static) + sdkstatic for f in vamp vamp-sdk vamp-hostsdk; do \ $(SED) 's,%PREFIX%,$(PREFIX)/$(TARGET),' "$(1)/pkgconfig/$$f.pc.in" \ @@ -31,5 +30,11 @@ define $(PKG)_BUILD done cp -rv '$(1)/vamp' '$(1)/vamp-hostsdk' '$(1)/vamp-sdk' '$(PREFIX)/$(TARGET)/include/' - cp -rv '$(1)/'libvamp-*.$(LIB_SUFFIX) '$(PREFIX)/$(TARGET)/lib' + + $(if $(BUILD_STATIC), \ + $(INSTALL) -m644 '$(1)/'libvamp-*.a '$(PREFIX)/$(TARGET)/lib/' \ + $(else), \ + $(foreach LIB, libvamp-hostsdk.a libvamp-sdk.a, \ + $(MAKE_SHARED_FROM_STATIC) '$(1)/$(LIB)' --ld '$(TARGET)-g++' LIBS=-lz;) \ + ) endef -- cgit v0.12