move CMake/SwiftPM common variables into swift-common.bbclass

Author: lhoward

classes/swift-cmake-base.bbclass

@@ -1,11 +1,7 @@
 inherit cmake
+inherit swift-common
 
-# avoid conflicts with meta-clang
-TOOLCHAIN = "gcc"
-
-TARGET_CC_ARCH:remove = "-mbranch-protection=standard"
-
-DEPENDS:append = " swift-native libgcc gcc glibc "
+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)}"

classes/swift-cmake.bbclass

@@ -1,5 +1,5 @@
 inherit swift-cmake-base
 
-DEPENDS:append = "swift-stdlib libdispatch swift-foundation"
+DEPENDS:append = " swift-stdlib libdispatch swift-foundation"
 
 TARGET_LDFLAGS += "-L${STAGING_DIR_TARGET}/usr/lib/swift/linux"

classes/swift-common.bbclass

@@ -0,0 +1,5 @@
+# avoid conflicts with meta-clang
+TOOLCHAIN = "gcc"
+
+# appears to cause segfault
+TARGET_CC_ARCH:remove:aarch64 = "-mbranch-protection=standard"

classes/swift.bbclass

@@ -1,12 +1,9 @@
-# avoid conflicts with meta-clang
-TOOLCHAIN = "gcc"
-
-TARGET_CC_ARCH:remove = "-mbranch-protection=standard"
+inherit swift-common
 
 SWIFT_BUILD_TESTS ?= "${DEBUG_BUILD}"
 
-DEPENDS += "swift-native glibc gcc libgcc swift-stdlib libdispatch swift-foundation"
-DEPENDS += "${@oe.utils.conditional('SWIFT_BUILD_TESTS', '1', 'swift-xctest swift-testing', '', d)}"
+DEPENDS:append = " swift-native glibc gcc libgcc 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"
 # (see 'swift [build|package|run|test] --help')