Bug#1135953: apt: does not fully honour the compiler choice

--HdTiUbrDjjdFNTe8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Source: apt
Version: 3.3.0
Severity: normal
Tags: patch
User: [email protected]
Usertags: rebootstrap

Hi Julian,

if you ask apt to build with a particular compiler, it does not fully
honour that choice. While the main apt build picks the compiler, the
gtest build falls back to gcc/g++. I'm attaching a patch that correctly
forwards the chosen compiler.

Helmut

--HdTiUbrDjjdFNTe8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="apt_3.3.0+nmu1.debdiff"

diff -Nru apt-3.3.0/debian/changelog apt-3.3.0+nmu1/debian/changelog
--- apt-3.3.0/debian/changelog	2026-05-01 18:40:52.000000000 +0200
+++ apt-3.3.0+nmu1/debian/changelog	2026-05-07 06:48:29.000000000 +0200
@@ -1,3 +1,10 @@
+apt (3.3.0+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Honour compiler choice. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]>  Thu, 07 May 2026 06:48:29 +0200
+
 apt (3.3.0) unstable; urgency=medium
 
   [ Anders Kaseorg ]
diff -Nru apt-3.3.0/test/libapt/CMakeLists.txt apt-3.3.0+nmu1/test/libapt/CMakeLists.txt
--- apt-3.3.0/test/libapt/CMakeLists.txt	2026-05-01 18:40:52.000000000 +0200
+++ apt-3.3.0+nmu1/test/libapt/CMakeLists.txt	2026-05-07 06:48:22.000000000 +0200
@@ -12,7 +12,9 @@
       include(ExternalProject)
       ExternalProject_Add(gtest PREFIX ./gtest
                                 SOURCE_DIR ${GTEST_SRCPATH}
-                                INSTALL_COMMAND true)
+                                INSTALL_COMMAND true
+                                CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+                                           -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
 
       link_directories(${CMAKE_CURRENT_BINARY_DIR}/gtest/src/gtest-build)
       link_directories(${CMAKE_CURRENT_BINARY_DIR}/gtest/src/gtest-build/lib)

--HdTiUbrDjjdFNTe8--