diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-01-21 11:15:20 -0600 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-01-21 11:15:20 -0600 |
| commit | 6b6f8603ef7b2f8eca46d2505457a05b82c290d5 (patch) | |
| tree | 95937d0946b48a30c99115028192162dfbe2e3a8 | |
| parent | 68494fc6a65b0a50c12cda969079109b80c840a0 (diff) | |
| download | swift-lang-6b6f8603ef7b2f8eca46d2505457a05b82c290d5.tar.gz swift-lang-6b6f8603ef7b2f8eca46d2505457a05b82c290d5.tar.xz swift-lang-6b6f8603ef7b2f8eca46d2505457a05b82c290d5.zip | |
Reworked the %prep section and removed custom defines
| -rw-r--r-- | swift-lang.spec | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/swift-lang.spec b/swift-lang.spec index cf35fd7..b3bd550 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,7 +1,4 @@ %global debug_package %{nil} -%global sourcename apple-swift -%global sourcedir %{_tmppath}/%{sourcename} -%global builddir %{sourcedir}/builds %global swifttag DEVELOPMENT-SNAPSHOT-2018-01-17-a Name: swift-lang Version: 4.1 @@ -37,28 +34,11 @@ importantly, Swift is designed to make writing and maintaining correct programs easier for the developer. %prep -rm -rf %{sourcedir} -mkdir -p %{sourcedir} - -# Have to rearrange the directories the way the Swift -# build script is expecting it and the naming scheme -# is not standard, so a one-liner isn't gonna do it -pushd %{sourcedir} -tar xzf %{SOURCE0} -tar xzf %{SOURCE1} -tar xzf %{SOURCE2} -tar xzf %{SOURCE3} -tar xzf %{SOURCE4} -tar xzf %{SOURCE5} -tar xzf %{SOURCE6} -tar xzf %{SOURCE7} -tar xzf %{SOURCE8} -tar xzf %{SOURCE9} -tar xzf %{SOURCE10} -tar xzf %{SOURCE11} -tar xzf %{SOURCE12} -tar xzf %{SOURCE13} +%setup -q -c swift -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 +# The Swift build script requires directories to be named +# in a specific way so renaming the source directories is +# necessary mv swift-clang-swift-%{swifttag} clang mv swift-cmark-swift-%{swifttag} cmark mv swift-compiler-rt-swift-%{swifttag} compiler-rt @@ -73,13 +53,11 @@ 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 -popd %build -%{sourcedir}/swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{builddir} installable_package=%{builddir}/swift-%{version}-fedora.tar.gz +swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{buildroot} installable_package=%{buildroot}/swift-%{version}-fedora.tar.gz %install -cp -r %{builddir}/* %{buildroot} rm %{buildroot}/swift-%{version}-fedora.tar.gz chmod 0755 %{buildroot}%{_bindir}/* chmod 0644 %{buildroot}/usr/share/man/man1/swift.1 |