Merge pull request #4 from MillerTechnologyPeru/trunk

Fixed Arm64 support

Author: jeremy-prater

.devcontainer/Dockerfile

@@ -0,0 +1,10 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/ubuntu/.devcontainer/base.Dockerfile
+
+# [Choice] Ubuntu version (use ubuntu-22.04 or ubuntu-18.04 on local arm64/Apple Silicon): ubuntu-22.04, ubuntu-20.04, ubuntu-18.04
+ARG VARIANT="ubuntu-20.04"
+FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
+
+# Install BitBake dependencies
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+     && apt-get -y install --no-install-recommends gawk wget git diffstat unzip texinfo gcc build-essential chrpath socat cpio python3 python3-pip python3-pexpect xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev xterm python3-subunit mesa-common-dev zstd liblz4-tool file
+

.devcontainer/devcontainer.json

@@ -0,0 +1,20 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/ubuntu
+{
+	"name": "Ubuntu",
+	"build": {
+		"dockerfile": "Dockerfile",
+		// Update 'VARIANT' to pick an Ubuntu version: jammy / ubuntu-22.04, focal / ubuntu-20.04, bionic /ubuntu-18.04
+		// Use ubuntu-22.04 or ubuntu-18.04 on local arm64/Apple Silicon.
+		"args": { "VARIANT": "ubuntu-20.04" }
+	},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}

.github/workflows/build.yml

@@ -0,0 +1,25 @@
+name: Build
+
+on: [push]
+
+jobs:
+
+    build:
+        name: Build
+        runs-on: ubuntu-latest
+        container: colemancda/meta-swift
+        strategy:
+          matrix:
+            machine: [beaglebone-yocto, qemuarm64]
+        steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+        - name: Build
+          run: |
+            export SRC_ROOT=$GITHUB_WORKSPACE
+            export POKY_DIR=/tmp/poky
+            export MACHINE=${{ matrix.machine }}
+            cd /tmp/
+            git clone --branch dunfell-23.0.20-cmake-3.22.3 https://github.com/MillerTechnologyPeru/poky.git
+            cd $SRC_ROOT
+            ./build.sh

.gitlab-ci.yml

@@ -0,0 +1,30 @@
+stages:
+  - build
+
+build-armv7:
+  image: colemancda/meta-swift
+  stage: build
+  script:
+    - export SRC_ROOT=$(pwd)
+    - export MACHINE=beaglebone-yocto
+    - export POKY_DIR=/tmp/poky
+    - cd /tmp/
+    - git clone --branch dunfell-23.0.20-cmake-3.22.3 https://github.com/MillerTechnologyPeru/poky.git
+    - cd $SRC_ROOT
+    - ./build.sh
+  tags:
+    - bastion-c5d.9xl
+
+build-arm64:
+  image: colemancda/meta-swift
+  stage: build
+  script:
+    - export SRC_ROOT=$(pwd)
+    - export MACHINE=qemuarm64
+    - export POKY_DIR=/tmp/poky
+    - cd /tmp/
+    - git clone --branch dunfell-23.0.20-cmake-3.22.3 https://github.com/MillerTechnologyPeru/poky.git
+    - cd $SRC_ROOT
+    - ./build.sh
+  tags:
+    - bastion-c5d.9xl

build.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+# Configuration
+SRC_ROOT="${SRC_ROOT:=$(pwd)}"
+POKY_DIR="${POKY_DIR:=$SRC_ROOT/../poky}"
+MACHINE="${MACHINE:=beaglebone-yocto}"
+
+# Build Yocto Poky
+cd $POKY_DIR
+source oe-init-build-env
+bitbake-layers add-layer $SRC_ROOT
+# Customize build
+touch conf/sanity.conf
+CONF_FILE=./conf/local.conf
+rm -rf $CONF_FILE
+echo "# Swift for Yocto" >> $CONF_FILE
+echo "MACHINE=\"${MACHINE}\"" >> $CONF_FILE
+#echo 'SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH"' >> $CONF_FILE
+#echo "USER_CLASSES += \"buildstats buildstats-summary\"" >> $CONF_FILE
+
+# build Swift
+bitbake swift-hello-world

classes/swift-cmake-base.bbclass

@@ -3,7 +3,7 @@ inherit cmake
 DEPENDS_append += " swift-native libgcc gcc glibc "
 
 SWIFT_TARGET_ARCH = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7', 'aarch64', d)}"
-SWIFT_TARGET_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-unknown-linux-gnueabihf', 'aarch64-unknown-linux-gnueabi', d)}"
+SWIFT_TARGET_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-unknown-linux-gnueabihf', 'aarch64-unknown-linux-gnu', d)}"
 TARGET_CPU_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-a', 'aarch64', d)}"
 
 HOST_CC_ARCH_prepend = "-target ${SWIFT_TARGET_NAME}"

classes/swift.bbclass

@@ -14,7 +14,7 @@ BUILD_MODE = "${@['release', 'debug'][d.getVar('DEBUG_BUILD') == '1']}"
 # Additional parameters to pass to SPM
 EXTRA_OESWIFT ?= ""
 
-SWIFT_TARGET_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-unknown-linux-gnueabihf', 'aarch64-unknown-linux-gnueabi', d)}"
+SWIFT_TARGET_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-unknown-linux-gnueabihf', 'aarch64-unknown-linux-gnu', d)}"
 
 # Workaround complex macros that cannot be automatically imported by Swift.
 # https://developer.apple.com/documentation/swift/imported_c_and_objective-c_apis/using_imported_c_macros_in_swift

recipes-devtools/swift/swift-stdlib.bb

@@ -24,7 +24,7 @@ inherit swift-cmake-base
 SWIFT_GGC_VERSION = "9.3.0"
 
 EXTRA_INCLUDE_FLAGS = "\
-    -I${STAGING_DIR_TARGET}/usr/include/c++/${SWIFT_GGC_VERSION}/arm-poky-linux-gnueabi \
+    -I${STAGING_DIR_TARGET}/usr/include/c++/${SWIFT_GGC_VERSION}/${TARGET_SYS} \
     -I${STAGING_DIR_TARGET}/usr/include/c++/${SWIFT_GGC_VERSION} \
     -I${STAGING_DIR_TARGET}"