[neon/forks/sip6/Neon/release] debian: Add a patch to not overwrite CXXFLAGS in the tests.

[Dmitry Shachnev]

Git commit b83db5578959eaeb42984af367425c53d9727f7d by Dmitry Shachnev.
Committed on 10/03/2026 at 11:24.
Pushed by carlosdem into branch 'Neon/release'.

Add a patch to not overwrite CXXFLAGS in the tests.

M  +1    -0    debian/changelog
M  +1    -0    debian/patches/series
A  +24   -0    debian/patches/test_cxxflags.diff

https://invent.kde.org/neon/forks/sip6/-/commit/b83db5578959eaeb42984af367425c53d9727f7d

diff --git a/debian/changelog b/debian/changelog
index fbbc8c2..e73f9a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sip6 (6.15.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Refresh debian/patches/intersphinx_local.diff.
+  * Add a patch to not overwrite CXXFLAGS in the tests.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 09 Mar 2026 18:37:05 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 457087d..104b254 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 intersphinx_local.diff
 system_ply.diff
+test_cxxflags.diff
diff --git a/debian/patches/test_cxxflags.diff b/debian/patches/test_cxxflags.diff
new file mode 100644
index 0000000..405b207
--- /dev/null
+++ b/debian/patches/test_cxxflags.diff
@@ -0,0 +1,24 @@
+From: Dmitry Shachnev <mitya57 at debian.org>
+Date: Tue, 10 Mar 2026 14:09:05 +0300
+Subject: test: Amend CXXFLAGS instead of overwriting them
+
+Forwarded: https://github.com/Python-SIP/sip/pull/104
+---
+ test/conftest.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/test/conftest.py b/test/conftest.py
+index 749ad67..38563d2 100644
+--- a/test/conftest.py
++++ b/test/conftest.py
+@@ -292,7 +292,9 @@ def _build_test_module(sip_file, test_dir, abi_version, package, exceptions,
+                 f.write(f'tags = [{tags_s}]\n')
+ 
+     # Configure the C++11 support.
+-    os.environ['CXXFLAGS'] = '-std=c++11'
++    cxxflags = os.environ.get('CXXFLAGS', '')
++    if '-std=c++11' not in cxxflags:
++        os.environ['CXXFLAGS'] = f'{cxxflags} -std=c++11'
+ 
+     # Build and move the test module.
+     _build_module(module_name, package,