* [PR PATCH] New package: swift-5.2.1
@ 2020-04-09 6:57 dinama
2020-04-09 20:26 ` Chocimier
` (13 more replies)
0 siblings, 14 replies; 16+ messages in thread
From: dinama @ 2020-04-09 6:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
There is a new pull request by dinama against master on the void-packages repository
https://github.com/dinama/void-packages swift
https://github.com/void-linux/void-packages/pull/20779
New package: swift-5.2.1
Apple's programming language
A patch file from https://github.com/void-linux/void-packages/pull/20779.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-swift-20779.patch --]
[-- Type: text/x-diff, Size: 6998 bytes --]
From f3353800be967496f298e713ecb4e4d3402915ac Mon Sep 17 00:00:00 2001
From: dinama <dinama@users.noreply.github.com>
Date: Thu, 9 Apr 2020 09:57:40 +0300
Subject: [PATCH] New package: swift-5.2.1
---
.../patches/swift-skip-ninja-icu-test.patch | 26 ++++
srcpkgs/swift/template | 118 ++++++++++++++++++
srcpkgs/swift/update | 2 +
3 files changed, 146 insertions(+)
create mode 100644 srcpkgs/swift/patches/swift-skip-ninja-icu-test.patch
create mode 100644 srcpkgs/swift/template
create mode 100644 srcpkgs/swift/update
diff --git a/srcpkgs/swift/patches/swift-skip-ninja-icu-test.patch b/srcpkgs/swift/patches/swift-skip-ninja-icu-test.patch
new file mode 100644
index 00000000000..221ab102dc5
--- /dev/null
+++ b/srcpkgs/swift/patches/swift-skip-ninja-icu-test.patch
@@ -0,0 +1,26 @@
+--- swift/utils/build-presets.ini
++++ swift/utils/build-presets.ini
+@@ -736,12 +736,12 @@ mixin-preset=
+ llbuild
+ swiftpm
+ xctest
+-libicu
++#libicu
+ libcxx
+
+ dash-dash
+
+-build-ninja
++#build-ninja
+ install-swift
+ install-lldb
+ install-llbuild
+@@ -758,7 +758,7 @@ build-swift-stdlib-unittest-extra
+ # Executes the lit tests for the installable package that is created
+ # Assumes the swift-integration-tests repo is checked out
+
+-test-installable-package
++#test-installable-package
+
+ # Build the benchmarks against the toolchain.
+ toolchain-benchmarks
diff --git a/srcpkgs/swift/template b/srcpkgs/swift/template
new file mode 100644
index 00000000000..26ee749a157
--- /dev/null
+++ b/srcpkgs/swift/template
@@ -0,0 +1,118 @@
+# Template file for 'swift'
+pkgname=swift
+version=5.2.1
+revision=1
+create_wrksrc=yes
+hostmakedepends="xtools clang cmake make ninja swig pkg-config rsync which
+ tzdata python python-six perl tar gzip "
+makedepends="python-devel libbsd-devel libxml2-devel sqlite-devel
+ libatomic-devel libcurl-devel libuuid-devel libedit-devel systemtap-devel
+ ncurses-devel glibc-devel icu-devel "
+depends="clang "
+short_desc="Apple's high-performance system programming language"
+maintainer="dinama <dinama@users.noreply.github.com>"
+license="Apache-2.0"
+homepage="https://www.swift.org/"
+
+archs="x86_64"
+nopie=yes
+nostrip=yes
+
+_tag=${pkgname}-${version}-RELEASE
+
+distfiles="https://github.com/apple/swift/archive/${_tag}.tar.gz>swift-${version}.tar.gz
+ https://github.com/apple/swift-corelibs-libdispatch/archive/${_tag}.tar.gz>swift-corelibs-libdispatch-${version}.tar.gz
+ https://github.com/apple/swift-corelibs-foundation/archive/${_tag}.tar.gz>swift-corelibs-foundation-${version}.tar.gz
+ https://github.com/apple/swift-integration-tests/archive/${_tag}.tar.gz>swift-integration-tests-${version}.tar.gz
+ https://github.com/apple/swift-corelibs-xctest/archive/${_tag}.tar.gz>swift-corelibs-xctest-${version}.tar.gz
+ https://github.com/apple/swift-package-manager/archive/${_tag}.tar.gz>swift-package-manager-${version}.tar.gz
+ https://github.com/apple/swift-llbuild/archive/${_tag}.tar.gz>swift-llbuild-${version}.tar.gz
+ https://github.com/apple/swift-cmark/archive/${_tag}.tar.gz>swift-cmark-${version}.tar.gz
+ https://github.com/apple/swift-xcode-playground-support/archive/${_tag}.tar.gz>swift-xcode-playground-support-${version}.tar.gz
+ https://github.com/apple/sourcekit-lsp/archive/${_tag}.tar.gz>sourcekit-lsp-${version}.tar.gz
+ https://github.com/apple/indexstore-db/archive/${_tag}.tar.gz>indexstore-db-${version}.tar.gz
+ https://github.com/apple/llvm-project/archive/${_tag}.tar.gz>llvm-project-${version}.tar.gz
+ https://github.com/apple/swift-syntax/archive/${_tag}.tar.gz>swift-syntax-${version}.tar.gz"
+
+checksum="3488e920ad989b1c6a8d25ef241d356a9951184fefcad19e230e3263b6e80f48
+ 7bab5d4d1e8e0aea0d7fec80b1dbf7f897389d19566e02ef5cd0e7026b968f10
+ 5a223f6398d5cedb94019f61beca69eb35473ca2cc65bcbd60d93248342f417d
+ c024eabdf1ff95e81761efb0ee8e3189aafe9a310ed73a9f2ff71f1480aba57f
+ d25df8b4caaef8e8339ecb2344fd5cbbe10b2e0f33d9861b1ec8fdebf7364645
+ 73e12edffce218d1fdfd626c2000a9d9f5805a946175899600b50379e885770e
+ 8812862ef27079fb41f13ac3e741a1e488bd321d79c6a57d026ca1c1e25d90c7
+ ac18a4a55739af8afb9009f4d8d7643a78fda47a329e1b1f8c782122db88b3b1
+ 1425d600563487b412ead6925506678cf28ae10f93854a65b93392fe934cbf95
+ 9dd65a18a3cff3efcb792b3df96385da1a095645d9c544a122dc3ec9ae7e7938
+ 43af8eeb9c98847bc610a2093d341b608a4120628c4aa0a410d157c4100d400e
+ f21cfa75413ab290991f28a05a975b15af9289140e2f595aa981e630496907e7
+ 85f62606a22031f3d768350fd3068d7e0955eac796fe4af13413d7fd0c8399f9"
+
+post_extract() {
+ # Swift build directories
+ mv swift-${_tag} swift
+ mv swift-corelibs-libdispatch-${_tag} swift-corelibs-libdispatch
+ mv swift-corelibs-foundation-${_tag} swift-corelibs-foundation
+ mv swift-integration-tests-${_tag} swift-integration-tests
+ mv swift-corelibs-xctest-${_tag} swift-corelibs-xctest
+ mv swift-package-manager-${_tag} swiftpm
+ mv swift-llbuild-${_tag} llbuild
+ mv swift-cmark-${_tag} cmark
+ mv swift-xcode-playground-support-${_tag} swift-xcode-playground-support
+ mv sourcekit-lsp-${_tag} sourcekit-lsp
+ mv indexstore-db-${_tag} indexstore-db
+ mv llvm-project-${_tag} llvm-project
+ mv swift-syntax-${_tag} swift-syntax
+
+ # 5.2 fix recursive symlinks
+ rm -rdf llbuild/include/llvm/Demangle/include
+ rm -rdf llbuild/lib/llvm/Demangle/include
+ mkdir -p llbuild/lib/llvm/Demangle/include/llvm
+ ln -s ../../../../../include/llvm/Demangle llbuild/lib/llvm/Demangle/include/llvm/Demangle
+
+ # 5.2 fix missing path
+ mkdir -p build/buildbot_linux/swiftpm-linux-x86_64/x86_64-pc-linux-gnu
+ ln -s ../x86_64-unknown-linux-gnu/release build/buildbot_linux/swiftpm-linux-x86_64/x86_64-pc-linux-gnu/release
+}
+
+pre_build() {
+ # default python2
+ xbps-alternatives -s python python
+
+ # fix xbps-src hardened flags for clang
+ export CFLAGS="${CFLAGS/-fstack-clash-protection/}"
+ export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection/}"
+ export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}"
+ export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}"
+
+ # flags
+ export CC=/usr/bin/clang
+ export LDFLAGS="-ldl -lpthread"
+ export VERBOSE=1
+}
+
+do_build() {
+ cd swift
+ utils/build-script --preset=buildbot_linux,no_test \
+ install_destdir=${wrksrc} \
+ installable_package=${wrksrc}/${_tag}-void.tar.gz
+}
+
+do_install() {
+ #rm -rdf usr
+ #tar -xf ${_tag}-void.tar.gz
+
+ # swift
+ vmkdir usr/libexec/swift
+ vcopy usr/* usr/libexec/swift
+
+ # man, ldconfig
+ # vinstall ${FILESDIR}/swift.conf 644 etc/ld.so.conf.d
+ vman usr/share/man/man1/swift.1
+
+ # links
+ vmkdir usr/bin
+ ln -fs /usr/libexec/swift/bin/swift ${DESTDIR}/usr/bin/swift
+ ln -fs /usr/libexec/swift/bin/swiftc ${DESTDIR}/usr/bin/swiftc
+ ln -fs /usr/libexec/swift/bin/sourcekit-lsp ${DESTDIR}/usr/bin/sourcekit-lsp
+}
diff --git a/srcpkgs/swift/update b/srcpkgs/swift/update
new file mode 100644
index 00000000000..92e02c12079
--- /dev/null
+++ b/srcpkgs/swift/update
@@ -0,0 +1,2 @@
+site=https://swift.org/download/
+pattern='swift-\K[\d.]+(?=-RELEASE)'
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
@ 2020-04-09 20:26 ` Chocimier
2020-04-09 21:37 ` q66
` (12 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Chocimier @ 2020-04-09 20:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-611736411
Comment:
We do not accept new packages depending on python 2.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
2020-04-09 20:26 ` Chocimier
@ 2020-04-09 21:37 ` q66
2020-04-10 6:57 ` dinama
` (11 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: q66 @ 2020-04-09 21:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-611765159
Comment:
there also doesn't seem to be any reason to limit it to x86_64
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
2020-04-09 20:26 ` Chocimier
2020-04-09 21:37 ` q66
@ 2020-04-10 6:57 ` dinama
2020-04-10 9:26 ` q66
` (10 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: dinama @ 2020-04-10 6:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 350 bytes --]
New comment by dinama on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-611907305
Comment:
> there also doesn't seem to be any reason to limit it to x86_64
possibly due to the python2 - build on other platforms does not go through
I'll try to apply patches to use the python3 and I'll come back.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
` (2 preceding siblings ...)
2020-04-10 6:57 ` dinama
@ 2020-04-10 9:26 ` q66
2020-04-10 9:28 ` q66
` (9 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: q66 @ 2020-04-10 9:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 425 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-611956675
Comment:
It probably just does not cross compile, might need marking nocross. As far as I can see, at least also ppc64le and aarch64 should be supported, maybe others. Musl platforms may need patching. Also, if a build with system llvm is possible, it'd be preferable. Patch the build if necessary
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
` (3 preceding siblings ...)
2020-04-10 9:26 ` q66
@ 2020-04-10 9:28 ` q66
2020-04-10 20:16 ` dinama
` (8 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: q66 @ 2020-04-10 9:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-611957150
Comment:
Also, skip the Travis CI build, it times out and you are just hogging the resources. Also, add a do_check so the testsuite can be run, we don't want untested packages
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
` (4 preceding siblings ...)
2020-04-10 9:28 ` q66
@ 2020-04-10 20:16 ` dinama
2020-04-10 20:18 ` q66
` (7 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: dinama @ 2020-04-10 20:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by dinama on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-612198721
Comment:
will I have to create a new PR or put patches in here?
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
` (5 preceding siblings ...)
2020-04-10 20:16 ` dinama
@ 2020-04-10 20:18 ` q66
2020-04-10 20:59 ` dinama
` (6 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: q66 @ 2020-04-10 20:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-612199669
Comment:
it's fine to put any potential patches together with this
i can test building it in some other environments later once it's shaped up (like ppc64le)
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
` (6 preceding siblings ...)
2020-04-10 20:18 ` q66
@ 2020-04-10 20:59 ` dinama
2020-04-20 12:14 ` dinama
` (5 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: dinama @ 2020-04-10 20:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
New comment by dinama on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-612214267
Comment:
building with the system llvm is not possible at this time. resolving other problems will take some time. i do it on next week.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
` (7 preceding siblings ...)
2020-04-10 20:59 ` dinama
@ 2020-04-20 12:14 ` dinama
2020-12-03 18:17 ` CRKatri
` (4 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: dinama @ 2020-04-20 12:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 485 bytes --]
New comment by dinama on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-616513665
Comment:
> it's fine to put any potential patches together with this
>
> i can test building it in some other environments later once it's shaped up (like ppc64le)
Compilation using clang is not fully supported in xbps-src (especially cross compilation). And the swift build system is unstable. For this reason, the package preparation is delayed.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
` (8 preceding siblings ...)
2020-04-20 12:14 ` dinama
@ 2020-12-03 18:17 ` CRKatri
2020-12-04 6:58 ` dinama
` (3 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: CRKatri @ 2020-12-03 18:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New comment by CRKatri on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-738191180
Comment:
swift 5.3.1 is now available which uses python3 now.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
` (9 preceding siblings ...)
2020-12-03 18:17 ` CRKatri
@ 2020-12-04 6:58 ` dinama
2020-12-27 15:22 ` CRKatri
` (2 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: dinama @ 2020-12-04 6:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
New comment by dinama on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-738606194
Comment:
> swift 5.3.1 is now available which uses python3 now.
thank you! I gave up trying to build - they were unstable and 1/3 ended with fail. I will try a new release soon.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
` (10 preceding siblings ...)
2020-12-04 6:58 ` dinama
@ 2020-12-27 15:22 ` CRKatri
2021-11-06 22:25 ` abenson
2021-11-06 22:25 ` [PR PATCH] [Closed]: " abenson
13 siblings, 0 replies; 16+ messages in thread
From: CRKatri @ 2020-12-27 15:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by CRKatri on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-751479929
Comment:
Taking a closer look, it's actually swift 5.4 that switched over, 5.4 is development though.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
` (11 preceding siblings ...)
2020-12-27 15:22 ` CRKatri
@ 2021-11-06 22:25 ` abenson
2021-11-06 22:25 ` [PR PATCH] [Closed]: " abenson
13 siblings, 0 replies; 16+ messages in thread
From: abenson @ 2021-11-06 22:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/20779#issuecomment-962517850
Comment:
Seemingly abandoned.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Closed]: New package: swift-5.2.1
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
` (12 preceding siblings ...)
2021-11-06 22:25 ` abenson
@ 2021-11-06 22:25 ` abenson
13 siblings, 0 replies; 16+ messages in thread
From: abenson @ 2021-11-06 22:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
There's a closed pull request on the void-packages repository
New package: swift-5.2.1
https://github.com/void-linux/void-packages/pull/20779
Description:
Apple's programming language
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Closed]: New package: swift-5.2.1
2020-04-08 22:51 [PR PATCH] " dinama
@ 2020-04-09 6:43 ` dinama
0 siblings, 0 replies; 16+ messages in thread
From: dinama @ 2020-04-09 6:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
There's a closed pull request on the void-packages repository
New package: swift-5.2.1
https://github.com/void-linux/void-packages/pull/20772
Description:
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2021-11-06 22:25 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-09 6:57 [PR PATCH] New package: swift-5.2.1 dinama
2020-04-09 20:26 ` Chocimier
2020-04-09 21:37 ` q66
2020-04-10 6:57 ` dinama
2020-04-10 9:26 ` q66
2020-04-10 9:28 ` q66
2020-04-10 20:16 ` dinama
2020-04-10 20:18 ` q66
2020-04-10 20:59 ` dinama
2020-04-20 12:14 ` dinama
2020-12-03 18:17 ` CRKatri
2020-12-04 6:58 ` dinama
2020-12-27 15:22 ` CRKatri
2021-11-06 22:25 ` abenson
2021-11-06 22:25 ` [PR PATCH] [Closed]: " abenson
-- strict thread matches above, loose matches on Subject: below --
2020-04-08 22:51 [PR PATCH] " dinama
2020-04-09 6:43 ` [PR PATCH] [Closed]: " dinama
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).