소스 검색

kFreeBSD: Remove support for obsolete platform

kFreeBSD is no longer maintained or supported and was never an
officially-supported release architecture for Debian.

Closes: #26742
Roger Leigh 10 달 전
부모
커밋
99c8abed55

+ 0 - 1
Help/variable/CMAKE_SYSTEM_NAME.rst

@@ -61,7 +61,6 @@ Value                     Name
 ``Haiku``                 Unix operating system inspired by BeOS
 ``HP-UX``                 Hewlett Packard Unix
 ``iOS``                   Apple mobile phone operating system
-``kFreeBSD``              FreeBSD kernel with a GNU userland
 ``Linux``                 All Linux-based distributions
 ``Midipix``               POSIX-compatible layer for Windows
 ``MirBSD``                MirOS BSD operating system

+ 1 - 1
Modules/FindPkgConfig.cmake

@@ -391,7 +391,7 @@ macro(_pkg_set_path_internal)
     # the system
     set(_lib_dirs)
     if(NOT DEFINED CMAKE_SYSTEM_NAME
-        OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+        OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|GNU)$"
             AND NOT CMAKE_CROSSCOMPILING))
       if(EXISTS "/etc/debian_version") # is this a debian system ?
         if(CMAKE_LIBRARY_ARCHITECTURE)

+ 1 - 1
Modules/GNUInstallDirs.cmake

@@ -252,7 +252,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
       "Please enable at least one language before including GNUInstallDirs.")
   endif()
 
-  if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+  if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|GNU)$"
       AND NOT CMAKE_CROSSCOMPILING)
     unset(__system_type_for_install)
     if(DEFINED ENV{CONDA_BUILD} AND DEFINED ENV{PREFIX})

+ 0 - 5
Modules/Platform/kFreeBSD-Initialize.cmake

@@ -1,5 +0,0 @@
-# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD,
-# and should be marked as LINUX
-include(Platform/Linux-Initialize)
-
-set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-kfreebsd-gnu[a-z0-9_]*")

+ 0 - 2
Modules/Platform/kFreeBSD.cmake

@@ -1,2 +0,0 @@
-# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD.
-include(Platform/Linux)

+ 0 - 4
Source/cmSystemTools.cxx

@@ -4298,10 +4298,6 @@ cm::string_view cmSystemTools::GetSystemName()
       systemName = "BSDOS";
     }
 
-    // fix for GNU/kFreeBSD, remove the GNU/
-    if (systemName.find("kFreeBSD") != cm::string_view::npos) {
-      systemName = "kFreeBSD";
-    }
     return systemName;
   }
   return "";

+ 1 - 1
Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMP0126_NEW.cmake

@@ -22,7 +22,7 @@ find_package(PkgConfig)
 
 
 if(NOT DEFINED CMAKE_SYSTEM_NAME
-    OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+    OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|GNU)$"
     AND NOT CMAKE_CROSSCOMPILING))
   if(EXISTS "/etc/debian_version") # is this a debian system ?
     if(CMAKE_LIBRARY_ARCHITECTURE MATCHES "^(i386-linux-gnu|x86_64-linux-gnu)$")

+ 1 - 1
Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake

@@ -19,7 +19,7 @@ find_package(PkgConfig)
 
 
 if(NOT DEFINED CMAKE_SYSTEM_NAME
-    OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+    OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|GNU)$"
     AND NOT CMAKE_CROSSCOMPILING))
   if(EXISTS "/etc/debian_version") # is this a debian system ?
     if(CMAKE_LIBRARY_ARCHITECTURE MATCHES "^(i386-linux-gnu|x86_64-linux-gnu)$")

+ 1 - 1
Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake

@@ -19,7 +19,7 @@ find_package(PkgConfig)
 
 
 if(NOT DEFINED CMAKE_SYSTEM_NAME
-    OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+    OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|GNU)$"
     AND NOT CMAKE_CROSSCOMPILING))
   if(EXISTS "/etc/debian_version") # is this a debian system ?
     if(CMAKE_LIBRARY_ARCHITECTURE MATCHES "^(i386-linux-gnu|x86_64-linux-gnu)$")

+ 1 - 1
Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake

@@ -19,7 +19,7 @@ find_package(PkgConfig)
 
 
 if(NOT DEFINED CMAKE_SYSTEM_NAME
-    OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+    OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|GNU)$"
     AND NOT CMAKE_CROSSCOMPILING))
   if(EXISTS "/etc/debian_version") # is this a debian system ?
     if(CMAKE_LIBRARY_ARCHITECTURE MATCHES "^(i386-linux-gnu|x86_64-linux-gnu)$")

+ 0 - 4
Utilities/cmcurl/lib/CMakeLists.txt

@@ -236,10 +236,6 @@ if(BUILD_SHARED_LIBS)
     CMAKE_SYSTEM_NAME STREQUAL "Linux" OR
     CMAKE_SYSTEM_NAME STREQUAL "SunOS" OR
     CMAKE_SYSTEM_NAME STREQUAL "Haiku" OR
-    CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD" OR
-    # FreeBSD comes with the a.out and ELF flavours but a.out was supported
-    # up to v3.x and ELF from v3.x. I cannot imagine someone running CMake
-    # on those ancient systems.
     CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     set(_soversion_default TRUE)
   else()

+ 0 - 16
Utilities/cmlibuv/CMakeLists.txt

@@ -232,22 +232,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     )
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD")
-  list(APPEND uv_libraries
-    freebsd-glue
-    )
-  list(APPEND uv_headers
-    include/uv/bsd.h
-    )
-  list(APPEND uv_sources
-    src/unix/bsd-ifaddrs.c
-    src/unix/bsd-proctitle.c
-    src/unix/freebsd.c
-    src/unix/kqueue.c
-    src/unix/posix-hrtime.c
-    )
-endif()
-
 if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
   list(APPEND uv_libraries
     kvm

+ 0 - 3
bootstrap

@@ -1783,9 +1783,6 @@ else
       uv_c_flags="${uv_c_flags} -D_GNU_SOURCE"
       libs="${libs} -ldl -lrt"
       ;;
-    *kFreeBSD*)
-      libs="${libs} -lfreebsd-glue"
-      ;;
     *NetBSD*)
       libs="${libs} -lkvm"
       ;;