SR-7039: Build and install libdispatch static libraries #25085

spevans · 2019-05-27T22:56:58Z

Resolves SR-7039 for -static-stdlib

spevans · 2019-05-27T22:57:11Z

Please test with following PR:

swiftlang/swift-corelibs-libdispatch#489
swiftlang/swift-integration-tests#58
@swift-ci test

compnerd · 2019-05-27T23:00:17Z

utils/build-script-impl

@@ -2113,7 +2113,11 @@ for host in "${ALL_HOSTS[@]}"; do

    for product in "${PRODUCTS[@]}"; do
        # Check if we should perform this action.
-        if ! [[ $(should_execute_action "${host}-${product}-build") ]]; then
+        tmp_product=${product}
+        if [ ${tmp_product} == "libdispatch_static" ]; then


Please don't mix and match sh and bash. Use either [[ and == or [ and =.

Huh, I never realised they were different for sh v bash. Anyway, fixed.

Yeah, POSIX sh only has [ and =. Bash extended that syntax to have ... something which behaved marginally more expectantly by people at that time. I would posit that the expectations of people around the behaviour of the conditional checks have changed, so they are just as confusing to many people today.

compnerd · 2019-05-27T23:00:29Z

utils/build-script-impl

@@ -3463,7 +3467,12 @@ for host in "${ALL_HOSTS[@]}"; do

    for product in "${PRODUCTS[@]}"; do
        # Check if we should perform this action.
-        if ! [[ $(should_execute_action "${host}-${product}-install") ]]; then
+        tmp_product=${product}
+        if [ ${tmp_product} == "libdispatch_static" ]; then


compnerd · 2019-05-27T23:01:44Z

utils/gen-static-stdlib-link-args

+-ldispatch
+-lswiftDispatch
+-lDispatchStubs
+-lbsd


There is no reason to assume libbsd - you can build with the stubs and without libbsd.

This file is really horrible. If this is meant to be a valid way to build, I think that we should hardcode this into the driver. CC @jrose-apple

If you dont have -lbsd you get the following link error:

/home/spse/swift-build-master-test/usr/lib/swift_static/linux/libdispatch.a(init.c.o):init.c:function _dispatch_object_missing_debug: error: undefined reference to 'strlcpy' /home/spse/swift-build-master-test/usr/lib/swift_static/linux/libdispatch.a(init.c.o):init.c:function _dispatch_debugv: error: undefined reference to 'strlcpy' /home/spse/swift-build-master-test/usr/lib/swift_static/linux/libdispatch.a(init.c.o):init.c:function _dispatch_logv_init: error: undefined reference to 'getprogname'

The idea of this file is that the static-stdlib-link-args file can be generated at build time depending on the platform, rather than having a complex list of files in the driver with lots of per platform #ifdefs.

I ended up removing these extra libs as they broke the swift tests anyway, so I just added them as extra link options to the swift-integration-tests test instead.

spevans · 2019-05-27T23:20:52Z

Please test with following PR:

swiftlang/swift-corelibs-libdispatch#489
swiftlang/swift-integration-tests#58
@swift-ci test

swift-ci · 2019-05-27T23:21:14Z

Build failed
Swift Test OS X Platform
Git Sha - ef33f113fd2839599284a944024a3c56e8554d6d

swift-ci · 2019-05-27T23:22:58Z

Build failed
Swift Test Linux Platform
Git Sha - ef33f113fd2839599284a944024a3c56e8554d6d

spevans · 2019-05-28T07:00:02Z

Please test with following PR:

swiftlang/swift-corelibs-libdispatch#489
swiftlang/swift-integration-tests#58
@swift-ci test

swift-ci · 2019-05-28T07:02:18Z

Build failed
Swift Test Linux Platform
Git Sha - 721cca02e1821a668776ce84c185a28f40871b0c

swift-ci · 2019-05-28T07:03:50Z

Build failed
Swift Test OS X Platform
Git Sha - 721cca02e1821a668776ce84c185a28f40871b0c

spevans · 2019-05-28T14:43:17Z

Please test with following PR:

swiftlang/swift-corelibs-libdispatch#489
swiftlang/swift-integration-tests#58
@swift-ci test

swift-ci · 2019-05-28T14:45:27Z

Build failed
Swift Test Linux Platform
Git Sha - b3d521a671b6f5a107393494a9d25c7064fd6dbc

swift-ci · 2019-05-28T14:48:00Z

Build failed
Swift Test OS X Platform
Git Sha - b3d521a671b6f5a107393494a9d25c7064fd6dbc

jrose-apple · 2019-05-28T16:24:35Z

Does this always build the libdispatch static libraries, or does the product only get added if asked for?

spevans · 2019-05-28T16:38:37Z

It is switched on here https://github.com/apple/swift/blob/master/utils/build-script-impl#L1261

jrose-apple · 2019-05-28T17:40:09Z

Got it. The idea of products being configured and then enabled or not is confusing (although useful sometimes).

compnerd

@drodriguez may have opinions as he has been working to migrate things to python.

compnerd · 2019-05-29T00:38:22Z

utils/build-script-impl

@@ -2113,7 +2113,11 @@ for host in "${ALL_HOSTS[@]}"; do

    for product in "${PRODUCTS[@]}"; do
        # Check if we should perform this action.
-        if ! [[ $(should_execute_action "${host}-${product}-build") ]]; then
+        tmp_product=${product}


Why not simplify this further?

for product in ${PRODUCTS[@]} ; do product=${product//_static/}

should effectively give you all the changes that you need for all the products being built statically. Generalising that means that we don't need to handle each product individually.

At the moment the Foundation static libs dont build so I dont want foundation_static enabled, however once it's working I will up update to that to enable it for both. So for now just libdispatch will be enabled.

drodriguez · 2019-05-29T17:13:22Z

Should be fine. I’m still a little bit away of porting dispatch to the new system, and it already had to do some special bits for the dynamic/static bits.

What I am curious is if it is OK to execute the steps for libdispatch twice (since libdispatch can be a product at the same time as libdispatch_static).

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

It still executes the libdispatch_static part as libdispatch_static, it only passes the name as libdispatch to should_execute_action.

drodriguez · 2019-05-29T18:14:52Z

Right. Sorry about the question. That's what happen when I type before having my morning coffee (disclusure: I don’t drink coffee, so that's my normal state).

spevans · 2019-05-29T23:13:13Z

@drodriguez @compnerd Does this PR look ok to you now?

drodriguez

It's OK for me, but you might want to change the description, which no longer match the contents of the PR after all the changes (unless GitHub is showing me just changes in build-script-impl for some reason).

spevans · 2019-05-30T06:38:45Z

@swift-ci test and merge

spevans · 2019-05-30T06:44:45Z

@swift-ci test and merge

PR #25085 [1] enabled building and installing the static variant of the libdispatch library in build-script-impl. This broke the `tsan-libdispatch-test` preset [2]. Let's make sure we pass along the options specified in `libdispatch-cmake-options` when building the static variant. [1] #25085 [2] #24330 rdar://problem/49177823

spevans mentioned this pull request May 27, 2019

SR-7039: Add test for -static-stdlib when using Dispatch swiftlang/swift-integration-tests#58

Merged

compnerd reviewed May 27, 2019

View reviewed changes

spevans force-pushed the pr_sr_7039 branch from ef33f11 to 721cca0 Compare May 27, 2019 23:19

spevans force-pushed the pr_sr_7039 branch from 721cca0 to b3d521a Compare May 28, 2019 06:56

SR-7039: Build and install libdispatch static libraries

976c1f9

spevans force-pushed the pr_sr_7039 branch from b3d521a to 976c1f9 Compare May 28, 2019 14:42

compnerd reviewed May 29, 2019

View reviewed changes

drodriguez approved these changes May 29, 2019

View reviewed changes

compnerd approved these changes May 30, 2019

View reviewed changes

swift-ci merged commit a21cc81 into swiftlang:master May 30, 2019

yln mentioned this pull request Aug 12, 2019

[build-script] Propagate libdispatch-cmake-options #26620

Merged

spevans mentioned this pull request Nov 15, 2019

[Linux] Build and install Foundation static libraries. #28293

Merged

spevans mentioned this pull request May 28, 2019

[SR-7039] can't use -static-stdlib (or -static-executable) with any Dispatch using app swiftlang/swift-corelibs-libdispatch#662

Closed

SR-7039: Build and install libdispatch static libraries #25085

SR-7039: Build and install libdispatch static libraries #25085

Uh oh!

Conversation

spevans commented May 27, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

spevans commented May 27, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

spevans commented May 27, 2019

Uh oh!

swift-ci commented May 27, 2019

Uh oh!

swift-ci commented May 27, 2019

Uh oh!

spevans commented May 28, 2019

Uh oh!

swift-ci commented May 28, 2019

Uh oh!

swift-ci commented May 28, 2019

Uh oh!

spevans commented May 28, 2019

Uh oh!

swift-ci commented May 28, 2019

Uh oh!

swift-ci commented May 28, 2019

Uh oh!

jrose-apple commented May 28, 2019

Uh oh!

spevans commented May 28, 2019

Uh oh!

jrose-apple commented May 28, 2019

Uh oh!

compnerd left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

drodriguez commented May 29, 2019

Uh oh!

spevans commented May 29, 2019

Uh oh!

drodriguez commented May 29, 2019

Uh oh!

spevans commented May 29, 2019

Uh oh!

drodriguez left a comment

Choose a reason for hiding this comment

Uh oh!

spevans commented May 30, 2019

Uh oh!

spevans commented May 30, 2019

Uh oh!

Uh oh!

spevans commented May 27, 2019 •

edited

Loading