From 7fd944e62f96c2330c5b5b862f160f37c106684f Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Tue, 14 Dec 2021 14:59:49 +0100 Subject: [PATCH] Use DEB_*_MAIN_APPEND rather than passing build flags manually --- debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index fe66d0e0..5b5f99fe 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,7 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \ #DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \ #^((.*\.jpg)|(.*\.JPG)|(.*\.gif)|(.*\.png)|(.*\.ico)|(.*\.icns)|(gradle-wrapper\.jar)|(.*\.mp3)|(.*\.caf)|(.*\.nib)|examples/InAppPurchase/Signing/InAppPurchase\.keystore|examples/(InAppPurchase/BinaryData/(Robot|Ed|Jules|JB|Fabian|Lukasz)[012]\.ogg|AUv3Synth|PlugInSamples/MultiOutSynth)/Source/BinaryData/singing\.ogg|examples/Demo/Resources/cello\.wav|examples/Demo/Resources/icons\.zip|modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinResources\.rsr|examples/ComponentTutorialExample/Introduction to Components - Part 1\.pdf|debian/(changelog|copyright(|_hints|_newhints)))$ -LDFLAGS += $(shell $(PKG_CONFIG) --libs libjpeg libpng zlib) +LIBS = $(shell $(PKG_CONFIG) --libs libjpeg libpng zlib) # JUCE uses some c++11 features requiring atomic_store_8 and # atomic_load_8, so we need to link with libatomic on @@ -31,12 +31,14 @@ LDFLAGS += $(shell $(PKG_CONFIG) --libs libjpeg libpng zlib) noatomicarch = $(shell dpkg-architecture -qDEB_HOST_ARCH | egrep -x "(armel|powerpc|powerpcspe|m68k|mips|mipsel|sh4|riscv64)") # link with libatomic on architectures without built-in atomic ifeq ($(if $(noatomicarch),atomic), atomic) - LDFLAGS += -latomic - CPPFLAGS += -DDEBIAN_JUCERPROJECT_LIBS='\"atomic\"' + LIBS += -latomic + DEB_CPPFLAGS_MAINT_APPEND += -DDEBIAN_JUCERPROJECT_LIBS='\"atomic\"' endif +DEB_LDFLAGS_MAINT_APPEND += $(LIBS) + # Debian's Projucer is GPL -CPPFLAGS += -DJUCER_ENABLE_GPL_MODE=1 +DEB_CPPFLAGS_MAINT_APPEND += -DJUCER_ENABLE_GPL_MODE=1 %: dh $@ @@ -46,8 +48,6 @@ override_dh_auto_build-arch: $(DEBIAN_BUILD_ARTIFACTS)/juce.png dh_auto_build -D $(DEB_SRCDIR) -- \ V=1 \ - LDFLAGS="$(LDFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" \ $(empty) dh_auto_build --sourcedirectory=debian/extra/lv2-ttl-generator/ help2man -N \ -- 2.30.2