build: switch to bundled UUID

Rather than relying on the system UUID, use the bundled UUID on all the
targets.  There is some work needed to port this to windows, but this
should be sufficient for Linux (and FreeBSD).

Author: compnerd

CMakeLists.txt

@@ -19,7 +19,6 @@ option(FOUNDATION_PATH_TO_XCTEST_BUILD "Path to XCTest build" "")
 find_package(CURL REQUIRED)
 find_package(ICU COMPONENTS uc i18n REQUIRED)
 find_package(LibXml2 REQUIRED)
-find_package(UUID REQUIRED)
 
 include(SwiftSupport)
 include(GNUInstallDirs)
@@ -61,6 +60,9 @@ add_library(uuid
             STATIC
               uuid/uuid.h
               uuid/uuid.c)
+set_target_properties(uuid
+                      PROPERTIES
+                        POSITION_INDEPENDENT_CODE YES)
 # Add an include directory for the CoreFoundation framework headers to satisfy
 # the dependency on TargetConditionals.h
 target_compile_options(uuid
@@ -273,7 +275,8 @@ add_swift_library(Foundation
                     ${ICU_UC_LIBRARY} ${ICU_I18N_LIBRARY}
                     ${LIBXML2_LIBRARIES}
                     ${libdispatch_ldflags}
-                    ${uuid_LIBRARIES}
+                    -L${CMAKE_CURRENT_BINARY_DIR}
+                    -luuid
                     -Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN"
                   SWIFT_FLAGS
                     -DDEPLOYMENT_RUNTIME_SWIFT
@@ -289,11 +292,12 @@ if(NOT BUILD_SHARED_LIBS)
   set(Foundation_INTERFACE_LIBRARIES
       -L${install_dir}/usr/lib
       -lCoreFoundation
+      -L${CMAKE_CURRENT_BINARY_DIR}
+      -luuid
       ${CURL_LIBRARIES}
       ${ICU_UC_LIBRARY}
       ${ICU_I18N_LIBRARY}
-      ${LIBXML2_LIBRARIES}
-      ${uuid_LIBRARIES})
+      ${LIBXML2_LIBRARIES})
 endif()
 
 add_swift_executable(plutil
@@ -304,8 +308,8 @@ add_swift_executable(plutil
                        ${deployment_enable_libdispatch}
                        -F${install_dir}/System/Library/Frameworks
                      LINK_FLAGS
-                       -L${CMAKE_CURRENT_BINARY_DIR}
                        ${libdispatch_ldflags}
+                       -L${CMAKE_CURRENT_BINARY_DIR}
                        -lFoundation
                        ${Foundation_INTERFACE_LIBRARIES}
                        -Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN/../lib/swift/${swift_os}"
@@ -318,6 +322,7 @@ add_swift_executable(plutil
                        ${swift_enable_testing}
                        ${swift_optimization_flags}
                      DEPENDS
+                       uuid
                        Foundation
                        CoreFoundation)
 
@@ -339,6 +344,7 @@ if(ENABLE_TESTING)
                          -I;${ICU_INCLUDE_DIR}
                          ${libdispatch_cflags}
                        DEPENDS
+                         uuid
                          Foundation
                          CoreFoundation)