No commit message

finagolfin · Oct 1, 2024 · 27cd205 · 27cd205
1 parent 098ce24
commit 27cd205
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/sdks.yml b/.github/workflows/sdks.yml
@@ -493,13 +493,10 @@ jobs:
         run: |
           if [[ ${{ matrix.version }} = 'release' ]]; then
             TAG="${{ needs.get-latest-toolchain.outputs.release-version }}"
-            echo "latest=$(echo $TAG | cut -d- -f2)" >> $GITHUB_OUTPUT
           elif [ ${{ matrix.version }} = 'devel' ]; then
             TAG="${{ needs.get-latest-toolchain.outputs.devel-version }}"
-            echo "latest=$(echo $TAG | cut -d- -f5-7)" >> $GITHUB_OUTPUT
           else
             TAG="${{ needs.get-latest-toolchain.outputs.trunk-version }}"
-            echo "latest=$(echo $TAG | cut -d- -f4-6)" >> $GITHUB_OUTPUT
           fi
           echo "tag=$TAG" >> $GITHUB_OUTPUT
       # download the previously-cached artifacts for the matrix version

diff --git a/get-packages-and-swift-source.swift b/get-packages-and-swift-source.swift
@@ -219,6 +219,12 @@ _ = runCommand("patchelf", with: ["--set-rpath", "$ORIGIN",
           "\(sdkPath.appendingPathComponent("usr/lib/libcurl.so"))",
           "\(sdkPath.appendingPathComponent("usr/lib/libxml2.so"))"])
 
+// TODO: need to de-version .so SONAME and NEEDS in order to support loading from .apk files:
+// patchelf --replace-needed libssl.so.3 libssl.so libcurl.so
+// patchelf --replace-needed libssl.so.3 libssl.so libssh2.so
+// patchelf --set-soname libssl.so libssl.so.3
+// and so on, for each versioned library…
+
 for repo in swiftRepos {
   print("Checking for \(repo) source")
   if !fmd.fileExists(atPath: cwd.appendingPathComponent(repo)) {