Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: finagolfin/swift-android-sdk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7fcbde815d323cc42eb0faaebec183c6105b617e
Choose a base ref
..
head repository: finagolfin/swift-android-sdk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 169c54b31255d4358945b0d7081b89f6311f37d9
Choose a head ref
Showing with 6 additions and 4 deletions.
  1. +1 −1 .github/workflows/sdks.yml
  2. +5 −3 get-packages-and-swift-source.swift
2 changes: 1 addition & 1 deletion .github/workflows/sdks.yml
View file
Original file line number Diff line number Diff line change
@@ -526,7 +526,7 @@ jobs:
echo "Creating ${TRIPLE} from ${MERGEDIR}…"
# Remove executables and unused toolchain headers/libraries
rm -r usr/bin usr/lib/swift/pm usr/lib/libsqlite3.so usr/lib/lib{curses,ncurses,ncursesw}.so
rm -r usr/bin usr/lib/swift/pm usr/lib/libsqlite3.so usr/lib/lib{curses,ncurses}.so
rm -r usr/include/ncurses* usr/include/sqlite3*.h usr/lib/terminfo usr/share/{tabset,terminfo}
mkdir -p usr/lib/${TRIPLE}
8 changes: 5 additions & 3 deletions get-packages-and-swift-source.swift
View file
Original file line number Diff line number Diff line change
@@ -236,9 +236,7 @@ for soFile in try fmd.contentsOfDirectory(atPath: libPath) {
let soPath = libPath.appendingPathComponent(soFile)
let soBasePath = libPath.appendingPathComponent(soBase)
if (try? fmd.destinationOfSymbolicLink(atPath: soPath)) != nil {
if !["libcurses.so", "libncurses.so"].contains(soFile) {
try fmd.removeItem(atPath: soPath) // clear links
}
try fmd.removeItem(atPath: soPath) // clear links
} else if !soVersion.isEmpty {
// otherwise move the version-suffixed path to the un-versioned destination
if (try? fmd.destinationOfSymbolicLink(atPath: soBasePath)) != nil {
@@ -249,6 +247,10 @@ for soFile in try fmd.contentsOfDirectory(atPath: libPath) {
}
}

// Rename ncurses for llbuild and add a symlink for SwiftPM
try fmd.moveItem(atPath: libPath.appendingPathComponent("libncursesw.so"), toPath: libPath.appendingPathComponent("libcurses.so"))
try fmd.createSymbolicLink(atPath: libPath.appendingPathComponent("libncurses.so"), withDestinationPath: "libcurses.so")

// update the rpath to be $ORIGIN, set the soname, and update all the "needed" sections for each of the peer libraries
for soFile in try fmd.contentsOfDirectory(atPath: libPath).filter({ $0.hasSuffix(".so")} ) {
let soPath = libPath.appendingPathComponent(soFile)