plutil: Add a specific rpath for plutil and use it when linking. #2307

spevans · 2019-05-26T19:23:18Z

plutil requires an rpath of '$ORIGIN/../lib/swift/${swift_os}'
so set this specificaly for plutil.
Add a test for running plutil, which relies on LD_LIBRARY_PATH
being set when the tests are run to point to the build directories.

spevans · 2019-05-26T19:23:27Z

@swift-ci test

spevans · 2019-05-26T20:30:00Z

@swift-ci test macos

spevans · 2019-05-26T21:43:29Z

@swift-ci test macos

compnerd · 2019-05-27T18:44:53Z

CMakeLists.txt

                       -L${CMAKE_CURRENT_BINARY_DIR}
+                       -L;${FOUNDATION_PATH_TO_LIBDISPATCH_BUILD}/src


This may add an empty /src to the library search path. @millenomi - is building Foundation with Dispatch something which is desired?

${FOUNDATION_PATH_TO_LIBDISPATCH_BUILD}/src was in the libdispatch_ldflags as a RUNPATH, so this is still needed for the link to succeed, but the RUNPATH itself isnt.

spevans · 2019-05-27T22:46:17Z

Please test with following pull request:
swiftlang/swift-integration-tests#57

@swift-ci please test

spevans · 2019-05-28T04:56:04Z

Please test with following pull request:
swiftlang/swift-integration-tests#57

@swift-ci please test macos

spevans · 2019-05-28T11:28:31Z

Please test with following pull request:
swiftlang/swift-integration-tests#57

@swift-ci please test macos

spevans · 2019-05-28T11:48:40Z

Please test with following pull request:
swiftlang/swift-integration-tests#57

@swift-ci please test macos

spevans · 2019-05-28T13:18:24Z

Please test with following pull request:
swiftlang/swift-integration-tests#57

@swift-ci please test macos

millenomi · 2019-05-28T17:35:26Z

I'm really not sure we should ship RPATHs in final executables. @jrose-apple how does the rest of the setup deal with dependencies?

jrose-apple · 2019-05-28T17:48:47Z

:-/ I think this is the right answer on Linux where we don't have an equivalent of Mach-O's @executable_path.

jrose-apple · 2019-05-28T17:49:34Z

($ORIGIN is that equivalent but AFAIK you can't link directly to something via $ORIGIN; you have to go through @rpath.)

Alternately, static-link all the things, but that's not a good answer either.

spevans · 2019-05-28T18:27:14Z

Please test with following pull request:
swiftlang/swift-integration-tests#57

@swift-ci please test macos

spevans · 2019-05-30T16:55:37Z

Please test with following pull request:
swiftlang/swift-integration-tests#57
swiftlang/swift-integration-tests#58

@swift-ci please test

jrose-apple · 2019-05-30T17:59:27Z

I don't think the cross-PR testing supports multiple PRs from the same repo. :-(

spevans · 2019-05-30T18:17:29Z

Yeah, I wanted to test swiftlang/swift-integration-tests#58 as it looks like tests can't be run directly in the swift-integration-tests repo (or maybe I dont have access).

spevans · 2019-05-31T14:49:41Z

@millenomi We still need to add RPATHs whilst we are installing from a tar since the install could be located anywhere, so paths relative to $ORIGIN are needed. The only alternative would be to create proper packages and then add the swift lib directory as a config file in /etc/ld.so.conf.d/

Other binaries ship with even worse paths, here is swift-build:

chrpath  -l ~/swift-DEVELOPMENT-SNAPSHOT-2019-01-15-a-ubuntu18.04/usr/bin/swift-build
/home/spse/swift-DEVELOPMENT-SNAPSHOT-2019-01-15-a-ubuntu18.04/usr/bin/swift-build: RUNPATH=/home/buildnode/jenkins/workspace/oss-swift-package-linux-ubuntu-18_04/build/buildbot_linux/swift-linux-x86_64/lib/swift/linux:$ORIGIN:$ORIGIN/../lib/swift/linux:/home/buildnode/jenkins/workspace/oss-swift-package-linux-ubuntu-18_04/build/buildbot_linux/swiftpm-linux-x86_64/.bootstrap/lib/swift/linux:$ORIGIN/../lib/swift/pm/llbuild:/home/buildnode/jenkins/workspace/oss-swift-package-linux-ubuntu-18_04/build/buildbot_linux/llbuild-linux-x86_64/lib

The only two ways I can think of to clean this up would be

Add an option to swiftc to disable adding RPATHs by default - A bit heavy if its only binaries built by the swift install that have bad paths but might be useful in other cases.
Install chrpath and use it to prune the paths after building.

jrose-apple · 2019-05-31T15:26:38Z

That option is coming in swiftlang/swift#24787, by the way, though it isn't hooked up to Linux yet. (I haven't landed it because it's immediately going to cause merge conflicts with the Apple-internal branches and I need to be ready to resolve them.)

spevans · 2019-05-31T15:44:28Z

That -no-stdlib-rpath options look ideal, I will keep an eye on the PR and then update it for Linux if anything needs to be done. I think that will allow us clean up a lot of RPATHs in the corelibs.

- plutil requires an rpath of '$ORIGIN/../lib/swift/${swift_os}' so set this specificaly for plutil. - Add a test for running plutil, which relies on LD_LIBRARY_PATH being set when the tests are run to point to the build directories.

spevans · 2019-06-22T17:33:44Z

@swift-ci test linux

spevans · 2019-06-22T17:43:40Z

Please test with following pull request:
swiftlang/swift-integration-tests#57

@swift-ci please test

spevans · 2019-06-25T07:33:08Z

@swift-ci test linux

compnerd · 2019-06-25T14:50:10Z

This breaks the android build! https://dev.azure.com/compnerd/windows-swift/_build/results?buildId=3584&view=logs&j=d925d346-119b-5290-d4d9-80cb246f632e

drodriguez · 2019-06-25T16:27:14Z

I don't know what's the configuration of the Linux CI machines, and if it is easy to change them, but if libBlocksRuntime.so was not installed in the system, many of these problems would surface earlier when testing Linux.

spevans · 2019-06-26T06:40:47Z

Ive unistalled the blocksRuntime package on my test VM now so it should catch anymore of these problems if I make them in future PRs.

spevans mentioned this pull request May 26, 2019

plutil: Add a test to check that plutil has the correct RUNPATH on Linux swiftlang/swift-integration-tests#57

Closed

compnerd reviewed May 27, 2019

View reviewed changes

spevans mentioned this pull request May 29, 2019

[cmake] Add runpath for libBlocksRuntime.so #2246

Closed

spevans force-pushed the pr_fix_plutil_rpath branch from bd445ee to c76eb37 Compare June 22, 2019 17:32

spevans merged commit 8d99ac9 into swiftlang:master Jun 25, 2019

		-L${CMAKE_CURRENT_BINARY_DIR}
		-L;${FOUNDATION_PATH_TO_LIBDISPATCH_BUILD}/src

plutil: Add a specific rpath for plutil and use it when linking. #2307

plutil: Add a specific rpath for plutil and use it when linking. #2307

Uh oh!

Conversation

spevans commented May 26, 2019

Uh oh!

spevans commented May 26, 2019

Uh oh!

spevans commented May 26, 2019

Uh oh!

spevans commented May 26, 2019

Uh oh!

compnerd May 27, 2019

Choose a reason for hiding this comment

Uh oh!

spevans May 27, 2019

Choose a reason for hiding this comment

Uh oh!

spevans commented May 27, 2019

Uh oh!

spevans commented May 28, 2019

Uh oh!

spevans commented May 28, 2019

Uh oh!

spevans commented May 28, 2019

Uh oh!

spevans commented May 28, 2019

Uh oh!

millenomi commented May 28, 2019

Uh oh!

jrose-apple commented May 28, 2019

Uh oh!

jrose-apple commented May 28, 2019

Uh oh!

spevans commented May 28, 2019

Uh oh!

spevans commented May 30, 2019

Uh oh!

jrose-apple commented May 30, 2019

Uh oh!

spevans commented May 30, 2019

Uh oh!

spevans commented May 31, 2019

Uh oh!

jrose-apple commented May 31, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

spevans commented May 31, 2019

Uh oh!

spevans commented Jun 22, 2019

Uh oh!

spevans commented Jun 22, 2019

Uh oh!

spevans commented Jun 25, 2019

Uh oh!

compnerd commented Jun 25, 2019

Uh oh!

drodriguez commented Jun 25, 2019

Uh oh!

spevans commented Jun 26, 2019

Uh oh!

Uh oh!

jrose-apple commented May 31, 2019 •

edited

Loading