build: switch libdispatch build to cmake #10670

compnerd · 2017-06-28T18:49:43Z

Use the cmake based build system for building libdispatch now that it is
able to build Linux, android, and even possible to cross-compile to
Windows.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

compnerd · 2017-06-28T18:50:09Z

CC: @phausler @das @llvm-beanz @gottesmm @modocache

modocache · 2017-06-28T18:52:01Z

@swift-ci please test

swift-ci · 2017-06-28T19:49:22Z

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - 0dc9b70926c01884b798f7d07cce0258eaff2df5
Test requested by - @modocache

compnerd · 2017-06-29T01:27:30Z

swift-corelibs-libdispatch PR#264 should fix the build issue that happened here

modocache · 2017-06-29T06:23:18Z

Please test with following PR:
swiftlang/swift-corelibs-libdispatch#264

@swift-ci Please test

swift-ci · 2017-06-29T06:30:12Z

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - 0dc9b70926c01884b798f7d07cce0258eaff2df5
Test requested by - @modocache

compnerd · 2017-06-30T05:36:06Z

CC @dgrove-oss

dgrove-oss · 2017-06-30T13:53:23Z

I think we aren't ready to merge this PR yet.

At least for me, I am seeing the libdispatch tests not linking correctly when built with CMake because of missing -L/-rpath to find libSwift. I will put in a dispatch PR for that today.

@compnerd have you build the entire source tree (including swift, swift-corelibs-dispatch, swiftpm, swift-corelibs-foundation) from scratch with CMake driving the libdispatch build with this PR in place for build-script?

compnerd · 2017-07-02T17:41:07Z

No, I've not built the entire source tree. I've been focused on the swift compiler/runtime and libdispatch for now. I know of at least one other place where we need to tweak things. But, having an occasional run here is helpful to ensure that I don't accidentally regress the Darwin build. I've been trying to keep the Darwin build untouched. Does it not use the autoconf build? If so, I can greatly simplify this PR. I know that @das has been working on trying to fix up the CMake build for libdispatch to be sufficient for the macOS build, and I'm really looking forward to that to have a single unified build for libdispatch.

compnerd · 2017-07-22T18:25:53Z

@swift-ci please test

Lets see where we stand

gottesmm · 2017-07-24T07:31:32Z

(Just doing a drive by test since the CI didn't seem to kick in).

gottesmm · 2017-07-24T07:31:34Z

@swift-ci please test

gottesmm · 2017-07-24T07:31:45Z

@swift-ci please test

swift-ci · 2017-07-24T07:39:30Z

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - 3fdc21bca365c5f74552baa86f81abd758dc93d6
Test requested by - @gottesmm

compnerd · 2017-07-24T20:40:55Z

Interesting, seems that the linker invocation is missing the -rpath-link for the swift runtime.

dgrove-oss · 2017-07-27T12:54:55Z

I think the missing -rpath-link is because on the dispatch side it is looking for SWIFT_RUNTIME_LIBDIR to be defined.

dgrove-oss · 2017-07-27T13:26:31Z

utils/build-script-impl

+                    -DCMAKE_CXX_COMPILER:PATH="${LLVM_BIN}/clang++"
+                    -DCMAKE_SWIFT_COMPILER:PATH="${SWIFTC_BIN}"
+                    -DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})"
+                    -DCMAKE_RUNTIME_LIBDIR:PATH="${DISPATCH_TMPLIBDIR}"


-DSWIFT_RUNTIME_LIBDIR:PATH="${DISPATCH_TMPLIBDIR}"

compnerd · 2017-07-29T21:00:58Z

Rebased and adjusted as per @dgrove-oss's point.

compnerd · 2017-07-29T21:01:02Z

@swift-ci please test

swift-ci · 2017-07-29T21:02:15Z

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - 3fdc21bca365c5f74552baa86f81abd758dc93d6
Test requested by - @compnerd

compnerd · 2017-07-31T03:34:56Z

Switched the sourcekit's build to use cmake as well. Adjusted the build-script to fix the rpath for swiftcore

compnerd · 2017-07-31T03:35:04Z

@swift-ci please test Linux platform

swift-ci · 2017-07-31T03:36:10Z

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - b36ced89564d556297778808d58b880e66d2b530
Test requested by - @compnerd

compnerd · 2017-09-15T17:11:55Z

@swift-ci please test

swift-ci · 2017-09-15T17:46:03Z

Build failed
Swift Test Linux Platform
Git Sha - 0e617c165cbbf840d5e4015a42862e1c7b6f553e

compnerd · 2017-09-16T00:40:56Z

Okay, so, the last failure was an install failure. I think that was caused by me using ${CMAKE_INSTALL_PREFIX} for the install prefix. Switch that to <INSTALL_DIR> which is the temporary install location for the ExternalProject. Hopefully, this should finally get it right.

compnerd · 2017-09-16T00:41:33Z

@swift-ci please test

swift-ci · 2017-09-16T00:45:48Z

Build failed
Swift Test OS X Platform
Git Sha - 0e617c165cbbf840d5e4015a42862e1c7b6f553e

swift-ci · 2017-09-16T00:46:35Z

Build failed
Swift Test Linux Platform
Git Sha - 0e617c165cbbf840d5e4015a42862e1c7b6f553e

compnerd · 2017-09-17T23:52:32Z

Okay, swift-corelibs-libdispatch PR303 should fix the symlink issue. It seems that I had them locally which is why I never saw this. I adjusted the dependencies to deal with BlocksRuntime dependencies being needed as well.

compnerd · 2017-09-17T23:54:34Z

Please test with following pull request:
swiftlang/swift-corelibs-libdispatch#303

@swift-ci Please test Linux platform

Use the cmake based build system for building libdispatch now that it is able to build Linux, android, and even possible to cross-compile to Windows.

CodaFi · 2017-09-18T00:37:04Z

Please test with following pull request:
swiftlang/swift-corelibs-libdispatch#303

@swift-ci Please test Linux platform

swift-ci · 2017-09-18T00:37:31Z

Build failed
Swift Test Linux Platform
Git Sha - e21d87b33f11ef24cda0296a076746f5c09ec558

compnerd · 2017-09-18T01:44:06Z

@CodaFi thanks! Great, it now seems to also pass on the build bots! This is great! Need to wait for @das to get the PR#303 merged in libdispatch and then we can switch over to the CMake build! ❤️

compnerd · 2017-09-18T03:36:26Z

@swift-ci please smoke test macOS platform

compnerd · 2017-09-18T03:37:37Z

Please test with following pull request:
swiftlang/swift-corelibs-libdispatch#303

@swift-ci Please test macOS platform

swift-ci · 2017-09-18T03:41:58Z

Build failed
Swift Test OS X Platform
Git Sha - e21d87b33f11ef24cda0296a076746f5c09ec558

compnerd · 2017-09-18T15:38:10Z

Just need to wait for the dispatch PR to get merged before this can be merged.

gottesmm · 2017-09-18T19:26:47Z

@compnerd I am soooo excited about this! Getting rid of autoconf from the build? +1! +1!

gottesmm · 2017-09-18T22:06:13Z

Woot!

dgrove-oss mentioned this pull request Jun 30, 2017

link swift libraries when building test executables swiftlang/swift-corelibs-libdispatch#270

Merged

compnerd force-pushed the dispatch-cmake branch 2 times, most recently from 7af6503 to 8501587 Compare July 2, 2017 18:14

compnerd force-pushed the dispatch-cmake branch from 8501587 to 3fdc21b Compare July 22, 2017 18:25

dgrove-oss reviewed Jul 27, 2017

View reviewed changes

compnerd force-pushed the dispatch-cmake branch from 3fdc21b to b36ced8 Compare July 29, 2017 21:00

compnerd force-pushed the dispatch-cmake branch 2 times, most recently from 4ff8bb8 to dca06d5 Compare July 31, 2017 03:31

compnerd force-pushed the dispatch-cmake branch from dca06d5 to 0e617c1 Compare September 15, 2017 17:06

compnerd force-pushed the dispatch-cmake branch from 0e617c1 to e21d87b Compare September 16, 2017 00:41

build: switch libdispatch build to cmake

8d3c30e

Use the cmake based build system for building libdispatch now that it is able to build Linux, android, and even possible to cross-compile to Windows.

compnerd force-pushed the dispatch-cmake branch from e21d87b to 8d3c30e Compare September 18, 2017 00:01

compnerd merged commit 0ebee3f into swiftlang:master Sep 18, 2017

compnerd deleted the dispatch-cmake branch September 18, 2017 21:23

build: switch libdispatch build to cmake #10670

build: switch libdispatch build to cmake #10670

Uh oh!

Conversation

compnerd commented Jun 28, 2017

Uh oh!

compnerd commented Jun 28, 2017

Uh oh!

modocache commented Jun 28, 2017

Uh oh!

swift-ci commented Jun 28, 2017

Uh oh!

compnerd commented Jun 29, 2017

Uh oh!

modocache commented Jun 29, 2017

Uh oh!

swift-ci commented Jun 29, 2017

Uh oh!

compnerd commented Jun 30, 2017

Uh oh!

dgrove-oss commented Jun 30, 2017

Uh oh!

compnerd commented Jul 2, 2017

Uh oh!

compnerd commented Jul 22, 2017

Uh oh!

gottesmm commented Jul 24, 2017

Uh oh!

gottesmm commented Jul 24, 2017

Uh oh!

gottesmm commented Jul 24, 2017

Uh oh!

swift-ci commented Jul 24, 2017

Uh oh!

compnerd commented Jul 24, 2017

Uh oh!

dgrove-oss commented Jul 27, 2017

Uh oh!

dgrove-oss Jul 27, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

compnerd commented Jul 29, 2017

Uh oh!

compnerd commented Jul 29, 2017

Uh oh!

swift-ci commented Jul 29, 2017

Uh oh!

compnerd commented Jul 31, 2017

Uh oh!

compnerd commented Jul 31, 2017

Uh oh!

swift-ci commented Jul 31, 2017

Uh oh!

compnerd commented Sep 15, 2017

Uh oh!

swift-ci commented Sep 15, 2017

Uh oh!

compnerd commented Sep 16, 2017

Uh oh!

compnerd commented Sep 16, 2017

Uh oh!

swift-ci commented Sep 16, 2017

Uh oh!

swift-ci commented Sep 16, 2017

Uh oh!

compnerd commented Sep 17, 2017

Uh oh!

compnerd commented Sep 17, 2017

Uh oh!

CodaFi commented Sep 18, 2017

Uh oh!

swift-ci commented Sep 18, 2017

Uh oh!

compnerd commented Sep 18, 2017

Uh oh!

compnerd commented Sep 18, 2017

Uh oh!

compnerd commented Sep 18, 2017

Uh oh!

dgrove-oss Jul 27, 2017 •

edited

Loading