Added patch to skip separate ninja build, updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-11-a

2 files changed, 27 insertions, 10 deletions

diff --git a/no-ninja-build.patch b/no-ninja-build.patch
new file mode 100644
index 0000000..e0a350f
--- /dev/null
+++ b/no-ninja-build.patch
@@ -0,0 +1,10 @@
+--- swift/utils/build-presets.orig	2018-06-12 12:33:42.690456898 -0500
++++ swift/utils/build-presets.ini	2018-06-12 12:34:18.454458545 -0500
+@@ -717,7 +717,6 @@
+ xctest
+ dash-dash
+ 
+-build-ninja
+ install-swift
+ install-lldb
+ install-llbuild
diff --git a/swift-lang.spec b/swift-lang.spec
index ff18ec0..7b45d8f 100644
--- a/swift-lang.spec
+++ b/swift-lang.spec
@@ -1,10 +1,10 @@
 %global debug_package %{nil}
-%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-06-10-a
-%global swiftgithash 7a35ad0
-%global swiftgitdate 20180610
+%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-06-11-a
+%global swiftgithash d99cd32
+%global swiftgitdate 20180611
 Name:           swift-lang
 Version:        4.2
-Release:        0.17.%{swiftgitdate}git%{swiftgithash}%{?dist}
+Release:        0.18.%{swiftgitdate}git%{swiftgithash}%{?dist}
 Summary:        Apple's Swift programming language
 License:        ASL 2.0
 URL:            https://swift.org
@@ -21,11 +21,11 @@ Source9:        https://github.com/apple/swift-llvm/archive/swift-%{swifttag}.ta
 Source10:       https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz
 Source11:       https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz
 Source12:       https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz
-Source13:       https://github.com/ninja-build/ninja/archive/v1.7.2.tar.gz#/ninja.tar.gz
-Source14:       swift-lang.conf
+Source13:       swift-lang.conf
 
 Patch0:         %{name}-%{version}-change-lldb-location.patch
 Patch1:		compiler-rt-no-ustat.patch
+Patch2:		no-ninja-build.patch
 
 BuildRequires:  which
 BuildRequires:  clang
@@ -46,6 +46,7 @@ BuildRequires:  libuuid-devel
 BuildRequires:  libedit-devel
 BuildRequires:  libicu-devel
 BuildRequires:  python2-sphinx
+BuildRequires:  ninja-build
 
 Requires:       glibc-devel
 Requires:       clang
@@ -67,7 +68,7 @@ correct programs easier for the developer.
 
 
 %prep
-%setup -q -c -n swift-source -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13
+%setup -q -c -n swift-source -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 
 
 # The Swift build script requires directories to be named
 # in a specific way so renaming the source directories is
@@ -85,7 +86,6 @@ mv swift-llvm-swift-%{swifttag} llvm
 mv swift-package-manager-swift-%{swifttag} swiftpm
 mv swift-swift-%{swifttag} swift
 mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-support
-mv ninja-1.7.2 ninja
 
 # This patch tells the Swift executable to look for its Swift-specific
 # lldb executable in /usr/libexec/swift-lldb, not in the same directory
@@ -97,6 +97,10 @@ mv ninja-1.7.2 ninja
 # it is merged this patch is necessary to build Swift on Fedora with the latest glibc. 
 %patch1 -p0
 
+# Since we require ninja for building, there's no sense to rebuild it just for Swift
+%patch2 -p0
+
+
 %build
 export VERBOSE=1
 export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0
@@ -154,7 +158,7 @@ cp -r %{_builddir}%{_includedir}/* %{buildroot}%{_includedir}
 mv %{buildroot}%{_includedir}/lldb %{buildroot}%{_includedir}/swift-lldb
 
 mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d/
-install -m 0644 %{SOURCE14} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swift-lang.conf
+install -m 0644 %{SOURCE13} %{buildroot}/%{_sysconfdir}/ld.so.conf.d/swift-lang.conf
 
 mkdir -p %{buildroot}%{_mandir}/man1
 install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1
@@ -175,13 +179,16 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Jun 12 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.18.20180611gitd99cd32
+- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-10-a and removed
+  separate ninja build (will now use the repo-based one)
 * Mon Jun 11 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.17.20180610git7a35ad0
 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-10-a 
 * Fri Jun 08 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.16.20180607git78e9497
 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-07-a 
 * Thu Jun 07 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.15.20180606git4e2064e
 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-06-a 
-* Sun Jun 05 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.14.20180604git9e274fc
+* Tue Jun 05 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.14.20180604git9e274fc
 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-04-a 
 * Sun Jun 03 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.13.20180602gitadad0f5
 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-02-a