From: IOhannes m zmölnig Date: Thu, 22 Aug 2019 07:49:46 +0000 (+0200) Subject: Patch to inject (arch-specific) build-flags into projects built with Projucer X-Git-Tag: archive/raspbian/5.4.5_ds0-1+rpi1~1^2~15 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d14751c34e869ad84fbe343b18de999a9889aea1;p=juce.git Patch to inject (arch-specific) build-flags into projects built with Projucer --- diff --git a/debian/patches/debian_link_systemlibs.patch b/debian/patches/debian_link_systemlibs.patch index 5f69537c..4be7166e 100644 --- a/debian/patches/debian_link_systemlibs.patch +++ b/debian/patches/debian_link_systemlibs.patch @@ -49,3 +49,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ packages.removeDuplicates (false); return packages; +@@ -563,6 +596,9 @@ + StringArray result (linuxLibs); + + auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'"); ++#ifdef DEBIAN_JUCERPROJECT_LIBS ++ libraries.addArray(StringArray::fromTokens (DEBIAN_JUCERPROJECT_LIBS, ";", "\"'")); ++#endif + libraries.removeEmptyStrings(); + + for (auto& lib : libraries) diff --git a/debian/rules b/debian/rules index 6b763427..f87b6f75 100755 --- a/debian/rules +++ b/debian/rules @@ -30,6 +30,7 @@ noatomicarch = $(shell dpkg-architecture -qDEB_HOST_ARCH | egrep -x "(armel|powe # link with libatomic on architectures without built-in atomic ifeq ($(if $(noatomicarch),atomic), atomic) LDFLAGS += -latomic + CPPFLAGS += -DDEBIAN_JUCERPROJECT_LIBS='\"atomic\"' endif %: @@ -41,6 +42,7 @@ override_dh_auto_build-arch: dh_auto_build -D $(DEB_SRCDIR) -- \ V=1 \ LDFLAGS="$(LDFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" \ $(empty) make -C debian/extra/lv2-ttl-generator/ help2man -N \