consolidate common variables between CMake and SwiftPM classes

in the interest of DRY, consolidate common variables between CMake and SwiftPM
classes, moving per-architecture tune flags into a new class
(swift-platform-tune.bbclass)

Author: lhoward

classes/swift-cmake-base.bbclass

@@ -1,15 +1,9 @@
 inherit cmake
 inherit swift-common
 
-DEPENDS:append = " swift-native libgcc gcc glibc"
-
-SWIFT_TARGET_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-unknown-linux-gnueabihf', '${TARGET_ARCH}-unknown-linux-gnu', d)}"
-SWIFT_TARGET_ARCH = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7', '${TARGET_ARCH}', d)}"
-TARGET_CPU_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-a', '${TARGET_ARCH}', d)}"
-
-# Determine SWIFT_GCC_VERSION by examining bitbake's context dictionary key
-# RECIPE_MAINTAINER:pn-gcc-source-<version>
 python () {
+    # Determine SWIFT_GCC_VERSION by examining bitbake's context dictionary key
+    # RECIPE_MAINTAINER:pn-gcc-source-<version>
     import shlex
 
     gcc_src_maint_pkg = [x for x in d if x.startswith("RECIPE_MAINTAINER:pn-gcc-source-")][0]
@@ -74,8 +68,11 @@ SWIFTC_BIN = "${STAGING_DIR_NATIVE}/usr/bin/swiftc"
 
 EXTRA_OECMAKE:append = " -DCMAKE_Swift_COMPILER=${SWIFTC_BIN}"
 EXTRA_OECMAKE:append = " -DCMAKE_SWIFT_COMPILER=${SWIFTC_BIN}"
-
-BUILD_MODE = "${@['release', 'debug'][d.getVar('DEBUG_BUILD') == '1']}"
+EXTRA_OECMAKE:append = ' -DCMAKE_Swift_FLAGS="${SWIFT_FLAGS}"'
+EXTRA_OECMAKE:append = " -DSWIFT_USE_LINKER=lld"
+EXTRA_OECMAKE:append = " -DLLVM_USE_LINKER=lld"
+EXTRA_OECMAKE:append = " -DLLVM_DIR=${HOST_LLVM_PATH}/cmake/llvm"
+EXTRA_OECMAKE:append = " -DLLVM_BUILD_LIBRARY_DIR=${HOST_LLVM_PATH}"
 
 # Additional parameters to pass to swiftc
 EXTRA_SWIFTC_FLAGS ??= ""
@@ -99,11 +96,3 @@ SWIFT_FLAGS = "-target ${SWIFT_TARGET_NAME} -use-ld=lld \
 "
 
 HOST_LLVM_PATH = "${STAGING_DIR_NATIVE}/usr/lib"
-
-EXTRA_OECMAKE:append = ' -DCMAKE_Swift_FLAGS="${SWIFT_FLAGS}"'
-EXTRA_OECMAKE:append = " -DSWIFT_USE_LINKER=lld"
-EXTRA_OECMAKE:append = " -DLLVM_USE_LINKER=lld"
-EXTRA_OECMAKE:append = " -DLLVM_DIR=${HOST_LLVM_PATH}/cmake/llvm"
-EXTRA_OECMAKE:append = " -DLLVM_BUILD_LIBRARY_DIR=${HOST_LLVM_PATH}"
-
-EXTRANATIVEPATH:append = " swift-tools"

classes/swift-common.bbclass

@@ -1,18 +1,13 @@
 # avoid conflicts with meta-clang
 TOOLCHAIN = "gcc"
 
-# force disable GLIBC_64BIT_TIME_FLAGS until SwiftNIO and other common packages
-# are updated to support 64-bit time_t on 32-bit systems. ABI incompatibility
-# may cause your program to crash; you have been warned.
-TARGET_CC_ARCH:remove:arm = "${GLIBC_64BIT_TIME_FLAGS}"
+DEPENDS:append = " swift-native glibc gcc libgcc"
+EXTRANATIVEPATH:append = " swift-tools"
 
-# appears to cause segfault
-TARGET_CC_ARCH:remove:aarch64 = "-mbranch-protection=standard"
+SWIFT_TARGET_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-unknown-linux-gnueabihf', '${TARGET_ARCH}-unknown-linux-gnu', d)}"
+SWIFT_TARGET_ARCH = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7', '${TARGET_ARCH}', d)}"
+TARGET_CPU_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-a', '${TARGET_ARCH}', d)}"
 
-# workaround for building on x86_64: SSE appears to cause cyclic header
-# dependency when building C++ std module. This needs investigation and an
-# upstream fix
-TARGET_CC_ARCH:remove:x86-64 = "-march=core2"
-TARGET_CC_ARCH:remove:x86-64 = "-mtune=core2"
-TARGET_CC_ARCH:remove:x86-64 = "-msse3"
-TARGET_CC_ARCH:remove:x86-64 = "-mfpmath=sse"
+BUILD_MODE = "${@['release', 'debug'][d.getVar('DEBUG_BUILD') == '1']}"
+
+inherit swift-target-tune

classes/swift-target-tune.bbclass

@@ -0,0 +1,15 @@
+# force disable GLIBC_64BIT_TIME_FLAGS until SwiftNIO and other common packages
+# are updated to support 64-bit time_t on 32-bit systems. ABI incompatibility
+# may cause your program to crash; you have been warned.
+TARGET_CC_ARCH:remove:arm = "${GLIBC_64BIT_TIME_FLAGS}"
+
+# appears to cause segfault
+TARGET_CC_ARCH:remove:aarch64 = "-mbranch-protection=standard"
+
+# workaround for building on x86_64: SSE appears to cause cyclic header
+# dependency when building C++ std module. This needs investigation and an
+# upstream fix
+TARGET_CC_ARCH:remove:x86-64 = "-march=core2"
+TARGET_CC_ARCH:remove:x86-64 = "-mtune=core2"
+TARGET_CC_ARCH:remove:x86-64 = "-msse3"
+TARGET_CC_ARCH:remove:x86-64 = "-mfpmath=sse"

classes/swift.bbclass

@@ -2,7 +2,7 @@ inherit swift-common
 
 SWIFT_BUILD_TESTS ?= "${DEBUG_BUILD}"
 
-DEPENDS:append = " swift-native glibc gcc libgcc swift-stdlib libdispatch swift-foundation"
+DEPENDS:append = " swift-stdlib libdispatch swift-foundation"
 DEPENDS:append = " ${@oe.utils.conditional('SWIFT_BUILD_TESTS', '1', ' swift-xctest swift-testing', '', d)}"
 
 # Default build directory for SPM is "./.build"
@@ -13,15 +13,11 @@ DEPENDS:append = " ${@oe.utils.conditional('SWIFT_BUILD_TESTS', '1', ' swift-xct
 B ?= "${S}/.build"
 EXTERNALSRC_BUILD ?= "${EXTERNALSRC}/.build"
 
-BUILD_MODE = "${@['release', 'debug'][d.getVar('DEBUG_BUILD') == '1']}"
 BUILD_DIR = "${B}/${BUILD_MODE}"
 
 # Additional parameters to pass to SPM
 EXTRA_OESWIFT ?= ""
 
-SWIFT_TARGET_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-unknown-linux-gnueabihf', '${TARGET_ARCH}-unknown-linux-gnu', d)}"
-SWIFT_TARGET_ARCH = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7', '${TARGET_ARCH}', d)}"
-
 do_fix_gcc_install_dir() {
     # symbolic links do not work, will not be found by Swift clang driver
     # this is necessary to make the libstdc++ location heuristic work, necessary for C++ interop
@@ -272,5 +268,3 @@ do_package_update[network] = "1"
 addtask do_package_update after do_configure
 
 EXPORT_FUNCTIONS do_configure do_compile do_package_update
-
-EXTRANATIVEPATH += "swift-tools"