diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-07-09 15:51:44 -0500 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-07-09 15:51:44 -0500 |
| commit | 779afdd97d714f29ef7ece5be610a581d9087c7c (patch) | |
| tree | ae91463b99c7807984b7fe971c1c2ce5db872ea1 | |
| parent | 6d871a4326ec5b92c498cc1d960cc343c396b4a1 (diff) | |
| download | swift-lang-779afdd97d714f29ef7ece5be610a581d9087c7c.tar.gz swift-lang-779afdd97d714f29ef7ece5be610a581d9087c7c.tar.xz swift-lang-779afdd97d714f29ef7ece5be610a581d9087c7c.zip | |
Testing against latest rawhide changes
| -rw-r--r-- | swift-lang.spec | 17 | ||||
| -rw-r--r-- | time-struct-redefined.patch | 10 |
2 files changed, 8 insertions, 19 deletions
diff --git a/swift-lang.spec b/swift-lang.spec index edcea69..3ca4eef 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-05-a -%global swiftgithash 1e2dc99 -%global swiftgitdate 20180705 +%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-07-08-a +%global swiftgithash 4652e6a +%global swiftgitdate 20180708 %global swiftbuild swift-source %global __provides_exclude_from ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 4.2 -Release: 0.29.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.30.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -29,7 +29,6 @@ Source14: swift-lang-runtime.conf Patch0: %{name}-%{version}-change-lldb-location.patch Patch1: compiler-rt-no-ustat.patch Patch2: no-ninja-build.patch -Patch3: time-struct-redefined.patch BuildRequires: clang @@ -110,13 +109,11 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # Since we require ninja for building, there's no sense to rebuild it just for Swift %patch2 -p0 -# Fixes an error in compiler-rt where the timespec struct is redefined -%patch3 -p0 - %build export VERBOSE=1 export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 +alias python=python2 swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz @@ -200,6 +197,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Mon Jul 09 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.30.20180708git4652e6a +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-08-a * Thu Jul 05 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.29.20180705git1e2dc99 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-05-a * Thu Jul 05 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.28.20180704gitf56a941 @@ -207,7 +206,7 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m of the runtime package so it can own the directory * Thu Jul 05 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.27.20180704gitf56a941 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-04-a -* Mon Jul 03 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.26.20180703git107e307 +* Mon Jul 02 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.26.20180703git107e307 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-03-a, added a filter for excluding lldb libraries from public view, and broke out the runtime libraries into their own -runtime package. diff --git a/time-struct-redefined.patch b/time-struct-redefined.patch deleted file mode 100644 index 7c34def..0000000 --- a/time-struct-redefined.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc.orig 2018-06-13 13:38:58.569034787 -0500 -+++ ./compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc 2018-06-13 13:39:14.866033724 -0500 -@@ -30,6 +30,7 @@ - // fine with newer headers, too. - #include <linux/posix_types.h> - #if defined(__x86_64__) || defined(__mips__) -+#define _STRUCT_TIMESPEC - #include <sys/stat.h> - #else - #define ino_t __kernel_ino_t |