6.1.3 FTBFS on Debian

[smeliza]

While updating the Debian package from 6.1.2 to 6.1.3 I encountered this new error and am not sure the best way to resolve it.

[86/142][ 60%][13.803s] Building CXX object utils/unittest/CMakeFiles/gtest.dir/googletest/src/gtest-all.cc.o
FAILED: utils/unittest/CMakeFiles/gtest.dir/googletest/src/gtest-all.cc.o 
/home/swm/workspace/debian/build/swiftlang/swiftlang-6.1.3/build/buildbot_linux/llvm-linux-x86_64/bin/clang++ -DGTEST_HAS_PTHREAD=0 -I/home/swm/workspace/debian/build/swiftlang/swiftlang-6.1.3/llbuild/include -I/home/swm/workspace/debian/build/swiftlang/swiftlang-6.1.3/llbuild/utils/unittest/googletest/include -I/home/swm/workspace/debian/build/swiftlang/swiftlang-6.1.3/llbuild/utils/unittest/googlemock/include -I/home/swm/workspace/debian/build/swiftlang/swiftlang-6.1.3/llbuild/utils/unittest/googletest -I/home/swm/workspace/debian/build/swiftlang/swiftlang-6.1.3/llbuild/utils/unittest/googlemock -fcf-protection=none -fcf-protection=none -O3 -DNDEBUG -std=c++14 -fPIC -fno-rtti -fno-exceptions -Wbool-conversion -Wconstant-conversion -Wdeprecated-declarations -Wdocumentation -Wempty-body -Wenum-conversion -Wimplicit-fallthrough -Wint-conversion -Winvalid-offsetof -Wmost -Wnewline-eof -Wnon-virtual-dtor -Woverloaded-virtual -Wparentheses -Wsign-compare -Wswitch -Wuninitialized -Wunused-function -Wunused-value -Wunused-variable -include /home/swm/workspace/debian/build/swiftlang/swiftlang-6.1.3/llbuild/include/libstdc++14-workaround.h -Wunreachable-code -UNDEBUG -MD -MT utils/unittest/CMakeFiles/gtest.dir/googletest/src/gtest-all.cc.o -MF utils/unittest/CMakeFiles/gtest.dir/googletest/src/gtest-all.cc.o.d -o utils/unittest/CMakeFiles/gtest.dir/googletest/src/gtest-all.cc.o -c /home/swm/workspace/debian/build/swiftlang/swiftlang-6.1.3/llbuild/utils/unittest/googletest/src/gtest-all.cc
In file included from /home/swm/workspace/debian/build/swiftlang/swiftlang-6.1.3/llbuild/utils/unittest/googletest/src/gtest-all.cc:42:
/home/swm/workspace/debian/build/swiftlang/swiftlang-6.1.3/llbuild/utils/unittest/googletest/src/gtest-death-test.cc:1385:26: error: unknown type name 'uintptr_t'; did you mean 'intptr_t'?
 1385 |         reinterpret_cast<uintptr_t>(stack_top) % kMaxStackAlignment == 0);
      |                          ^~~~~~~~~
      |                          intptr_t
/home/swm/workspace/debian/build/swiftlang/swiftlang-6.1.3/llbuild/utils/unittest/googletest/src/gtest-death-test.cc:308:38: note: expanded from macro 'GTEST_DEATH_TEST_CHECK_'
  308 |     if (!::testing::internal::IsTrue(expression)) { \
      |                                      ^
/usr/include/unistd.h:267:20: note: 'intptr_t' declared here
  267 | typedef __intptr_t intptr_t;
      |                    ^
1 error generated.

Any help would be appreciated.

[owenv]

Swift 6.1.3 only contains the 5 changes listed here, none of which I'd expect to impact compiling llbuild: https://forums.swift.org/t/announcing-swift-6-1-3/82022

Are you able to compare the command lines compiling this file in 6.1.2 to 6.1.3? My best guess is the C++ standard or some other option changed alongside a change to the environment and maybe there's a missing include now

[melizasw]

You are probably right as I just tried to build 6.1.2 and now it is failing at the same spot where 6.1.3 was failing due to a missing include of cstdint. I've patched that and am building again to see if I new get the same error as 6.1.3.

[melizasw]

It appears to be caused by the switch from GCC 14.2 to 15.2 or something related.

This is how I am getting around it:

--- swiftlang-6.1.3.orig/llbuild/utils/unittest/googletest/src/gtest-death-test.cc
+++ swiftlang-6.1.3/llbuild/utils/unittest/googletest/src/gtest-death-test.cc
@@ -46,6 +46,7 @@
 # include <errno.h>
 # include <fcntl.h>
 # include <limits.h>
+# include <stdint.h>
 
 # if GTEST_OS_LINUX
 #  include <signal.h>