diff options
| author | Ron Olson <tachoknight@gmail.com> | 2019-03-25 12:21:47 -0500 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2019-03-25 12:21:47 -0500 |
| commit | 1dee2917099183e204a309d07c9b285762d5bae0 (patch) | |
| tree | 51111635d3b14157939cf6b7bb9d7c1b697b7d49 | |
| parent | 5b78be18c4b8f01a22b2063db33fe79284db60a8 (diff) | |
| download | swift-lang-1dee2917099183e204a309d07c9b285762d5bae0.tar.gz swift-lang-1dee2917099183e204a309d07c9b285762d5bae0.tar.xz swift-lang-1dee2917099183e204a309d07c9b285762d5bae0.zip | |
Updated to latest 5.0 build; removed _gettid() patch as changes were made upstream
| -rw-r--r-- | gettid.patch | 20 | ||||
| -rw-r--r-- | swift-lang.spec | 24 |
2 files changed, 11 insertions, 33 deletions
diff --git a/gettid.patch b/gettid.patch deleted file mode 100644 index 5be918b..0000000 --- a/gettid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- swift-corelibs-libdispatch/src/queue.c.orig 2019-03-09 16:58:51.182875053 -0600 -+++ swift-corelibs-libdispatch/src/queue.c 2019-03-10 08:29:51.377391396 -0500 -@@ -926,7 +926,7 @@ - #ifdef SYS_gettid - DISPATCH_ALWAYS_INLINE - static inline pid_t --gettid(void) -+__gettid(void) - { - return (pid_t)syscall(SYS_gettid); - } -@@ -1054,7 +1054,7 @@ - #else - pthread_setspecific(__dispatch_tsd_key, &__dispatch_tsd); - #endif /* defined(_WIN32) */ -- __dispatch_tsd.tid = gettid(); -+ __dispatch_tsd.tid = __gettid(); - } - #endif - diff --git a/swift-lang.spec b/swift-lang.spec index d906443..8cf752b 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2019-03-10-a -%global swiftgithash 4d6e741 -%global swiftgitdate 20190310 +%global swifttag 5.0-DEVELOPMENT-SNAPSHOT-2019-03-24-a +%global swiftgithash 130a414 +%global swiftgitdate 20190324 %global swiftbuild swift-source %global __provides_exclude ^/usr/lib/swift-lldb/.*\\.so.* Name: swift-lang Version: 5.0 -Release: 0.50.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.51.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -30,9 +30,8 @@ Patch0: change-lldb-location.patch Patch1: no-ninja-build.patch Patch2: clangloc.patch Patch3: compiler-rt-fuzzer.patch -Patch4: gettid.patch -Patch5: swift-unwrapped.patch -Patch6: no-inplace-copy.patch +Patch4: swift-unwrapped.patch +Patch5: no-inplace-copy.patch BuildRequires: clang BuildRequires: cmake @@ -124,17 +123,13 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # Fixes an issue with using std::thread in a vector in compiler-rt %patch3 -p0 -# Fixes issue with local, static copy of gettid() function colliding with -# the glibc version -%patch4 -p0 - # Patch for handling optional issue with pthreads functions in Swift file # in the package mananger -%patch5 -p0 +%patch4 -p0 # Patch to handle library being copied to same directory; CMake 3.14 zeros # out the file -%patch6 -p0 +%patch5 -p0 %build @@ -237,6 +232,9 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %changelog +* Mon Mar 25 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.51.20190324git130a414 +- Updated to swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-24-a, removed _gettid + patch as the changed were merged upstream * Fri Mar 22 2019 Ron Olson <tachoknight@gmail.com> 5.0-0.50.20190310git4d6e741 - The swift-corelibs-xctest library was being zeroed out due to issue with CMake 3.14 where it was being copied into the same directory. A bug |