Package: cmake
Version: 3.30.5-1
Tags: patch upstream
User: helm...@debian.org
Usertags: rebootstrap
Control: affects -1 + src:libpng1.6

While bootstrapping Debian for musl-linux-any, I noticed that cmake
fails to consider /usr/lib/$DEB_HOST_MULTIARCH during a build of
libpng1.6. After some debugging, it became clear that it would only
recognize multiarch directories for glibc based systems and eventually,
I found the culprint in Linux-Initialize.cmake. I'm attaching a patch
that makes cmake recognize the multiarch directories for all Linux
systems rather than just GNU/Linux ones.

Helmut
--- cmake-3.30.5.orig/Modules/Platform/Linux-Initialize.cmake
+++ cmake-3.30.5/Modules/Platform/Linux-Initialize.cmake
@@ -2,4 +2,4 @@ set(LINUX 1)
 set(UNIX 1)
 
 # Match multiarch library directory names.
-set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*")
+set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-[a-z0-9_]*")

Reply via email to