From df88a930c08d9c58f5eff109fee5e1b5ac18026c Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 20 Jun 2025 21:01:47 +0200 Subject: [PATCH] MT#63051 debian: Fix make variable usage These variables used to be shell variables passed to the make invocations in various rules. But those got refactored into make variables. The problem is that in make the equal sign does not bind according to surrounding lack of spaces, and the first equal sign will mark an assignment for the rest of the string including subsequent equal signs. The other problem is with the CPPFLAGS assignment where it will assign append the value and then subsequent conditional assignments will not take place. Switch to use DEB_CPPFLAGS_APPEND, which was designed precisely for this purpose. Fixes: commit 9b5df2495e1fb8ad332895a1cf4e041112da51c6 Change-Id: Ice82295903729fed3f0fb11f750f3f2fdde2e09f (cherry picked from commit b7494cf7ffcfdb8b75e57d07e0e0527574a6a21a) --- debian/rules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 86fe5c6c..fb2fb119 100755 --- a/debian/rules +++ b/debian/rules @@ -9,16 +9,16 @@ EXCLUDED_MODULES=conf_auth examples/db_announce fast_ack gateway ivr mailbox mp3 EXCLUDED_DSM_MODULES=mod_aws mod_py EXCLUDED_DSM_PY_MODULES=mod_aws mod_py -CPPFLAGS += -DHAVE_XMLRPCPP_SSL - -export USE_SPANDSP=yes LONG_DEBUG_MESSAGE=yes CPPFLAGS="$(CPPFLAGS)" +export DEB_CPPFLAGS_APPEND = -DHAVE_XMLRPCPP_SSL export APP_NAME=ngcp-sems export SYSTEM_SAMPLECLOCK_RATE=48000LL +export LONG_DEBUG_MESSAGE=yes export USE_THREADPOOL=yes - +export USE_SPANDSP=yes export PYTHON_VERSION=3 + # Enable parallel builds for overrides. NUMJOBS = 1 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))