diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-11-19 06:15:35 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-11-19 17:59:50 +0100 |
| commit | 7ee27456e2684ea8fc924497c44049dd1ad15925 (patch) | |
| tree | 5db715363fb47527d22cceea2e75ce33cedc3924 | |
| parent | fa3f92ac782f8531079bf9584fe6714fc3d7c5ed (diff) | |
| download | current-7ee27456e2684ea8fc924497c44049dd1ad15925.tar.gz | |
Tue Nov 19 06:15:35 UTC 201920191119061535
d/rust-1.39.0-x86_64-1.txz: Upgraded.
19 files changed, 540 insertions, 433 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss index 76a14448..bdb00295 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,10 +11,21 @@ <description>Tracking Slackware development in git.</description> <language>en-us</language> <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id> - <pubDate>Mon, 18 Nov 2019 20:14:57 GMT</pubDate> - <lastBuildDate>Tue, 19 Nov 2019 07:59:46 GMT</lastBuildDate> + <pubDate>Tue, 19 Nov 2019 06:15:35 GMT</pubDate> + <lastBuildDate>Tue, 19 Nov 2019 16:59:45 GMT</lastBuildDate> <generator>maintain_current_git.sh v 1.11</generator> <item> + <title>Tue, 19 Nov 2019 06:15:35 GMT</title> + <pubDate>Tue, 19 Nov 2019 06:15:35 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20191119061535</link> + <guid isPermaLink="false">20191119061535</guid> + <description> + <![CDATA[<pre> +d/rust-1.39.0-x86_64-1.txz: Upgraded. + </pre>]]> + </description> + </item> + <item> <title>Mon, 18 Nov 2019 20:14:57 GMT</title> <pubDate>Mon, 18 Nov 2019 20:14:57 GMT</pubDate> <link>https://git.slackware.nl/current/tag/?h=20191118201457</link> diff --git a/ChangeLog.txt b/ChangeLog.txt index 5af16a5c..55a7aa3c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,6 @@ +Tue Nov 19 06:15:35 UTC 2019 +d/rust-1.39.0-x86_64-1.txz: Upgraded. ++--------------------------+ Mon Nov 18 20:14:57 UTC 2019 a/kernel-firmware-20191118_9581f15-noarch-1.txz: Upgraded. ap/rpm-4.15.1-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 18493ffd..b0c3da1d 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Mon Nov 18 20:26:45 UTC 2019 +Tue Nov 19 06:26:59 UTC 2019 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2019-11-18 20:14 . +drwxr-xr-x 12 root root 4096 2019-11-19 06:26 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 14642 2019-10-18 21:18 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 929262 2019-11-18 05:15 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-11-18 05:15 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 408 2019-11-19 06:26 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-11-19 06:26 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 737764 2019-11-18 20:14 ./ChangeLog.txt +-rw-r--r-- 1 root root 737861 2019-11-19 06:15 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2019-11-15 01:28 ./EFI/BOOT -rw-r--r-- 1 root root 1417216 2019-07-05 18:54 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2019-11-15 01:28 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1221838 2019-11-18 05:13 ./FILELIST.TXT +-rw-r--r-- 1 root root 1222862 2019-11-19 06:26 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 732539 2019-11-18 20:24 ./PACKAGES.TXT +-rw-r--r-- 1 root root 732539 2019-11-19 06:24 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3635 2019-11-15 00:59 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -833,11 +833,11 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches -rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT -drwxr-xr-x 18 root root 4096 2019-11-18 20:25 ./slackware64 --rw-r--r-- 1 root root 290506 2019-11-18 20:25 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-11-18 20:25 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 361885 2019-11-18 20:22 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3638044 2019-11-18 20:23 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2019-11-19 06:24 ./slackware64 +-rw-r--r-- 1 root root 290506 2019-11-19 06:24 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-11-19 06:24 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 361885 2019-11-19 06:22 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3645656 2019-11-19 06:23 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT drwxr-xr-x 2 root root 28672 2019-11-18 20:22 ./slackware64/a -rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt @@ -1433,7 +1433,7 @@ drwxr-xr-x 2 root root 20480 2019-11-18 20:22 ./slackware64/ap -rw-r--r-- 1 root root 506 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txt -rw-r--r-- 1 root root 3008036 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txz.asc -drwxr-xr-x 2 root root 20480 2019-11-18 20:22 ./slackware64/d +drwxr-xr-x 2 root root 20480 2019-11-19 06:07 ./slackware64/d -rw-r--r-- 1 root root 360 2019-11-01 21:37 ./slackware64/d/Cython-0.29.14-x86_64-1.txt -rw-r--r-- 1 root root 3223688 2019-11-01 21:37 ./slackware64/d/Cython-0.29.14-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-11-01 21:37 ./slackware64/d/Cython-0.29.14-x86_64-1.txz.asc @@ -1609,9 +1609,9 @@ drwxr-xr-x 2 root root 20480 2019-11-18 20:22 ./slackware64/d -rw-r--r-- 1 root root 385 2019-10-01 21:03 ./slackware64/d/ruby-2.6.5-x86_64-1.txt -rw-r--r-- 1 root root 5879712 2019-10-01 21:03 ./slackware64/d/ruby-2.6.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-10-01 21:03 ./slackware64/d/ruby-2.6.5-x86_64-1.txz.asc --rw-r--r-- 1 root root 426 2019-08-16 05:08 ./slackware64/d/rust-1.37.0-x86_64-1.txt --rw-r--r-- 1 root root 90052664 2019-08-16 05:08 ./slackware64/d/rust-1.37.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-08-16 05:08 ./slackware64/d/rust-1.37.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 426 2019-11-08 05:22 ./slackware64/d/rust-1.39.0-x86_64-1.txt +-rw-r--r-- 1 root root 46848056 2019-11-08 05:22 ./slackware64/d/rust-1.39.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-11-08 05:22 ./slackware64/d/rust-1.39.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 456 2019-08-10 04:24 ./slackware64/d/scons-3.1.1-x86_64-1.txt -rw-r--r-- 1 root root 827864 2019-08-10 04:24 ./slackware64/d/scons-3.1.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-08-10 04:24 ./slackware64/d/scons-3.1.1-x86_64-1.txz.asc @@ -5048,11 +5048,11 @@ drwxr-xr-x 2 root root 4096 2019-02-17 23:51 ./slackware64/y -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez -rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile -drwxr-xr-x 19 root root 4096 2019-11-18 20:26 ./source --rw-r--r-- 1 root root 471332 2019-11-18 20:26 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-11-18 20:26 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 665085 2019-11-18 20:26 ./source/FILE_LIST --rw-r--r-- 1 root root 17798894 2019-11-18 20:26 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2019-11-19 06:26 ./source +-rw-r--r-- 1 root root 471825 2019-11-19 06:26 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-11-19 06:26 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 665686 2019-11-19 06:25 ./source/FILE_LIST +-rw-r--r-- 1 root root 17885699 2019-11-19 06:25 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 110 root root 4096 2019-10-18 18:37 ./source/a -rw-r--r-- 1 root root 1034 2019-05-04 17:56 ./source/a/FTBFSlog @@ -6528,7 +6528,7 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/zsh -rwxr-xr-x 1 root root 4342 2019-09-29 23:48 ./source/ap/zsh/zsh.SlackBuild -rw-r--r-- 1 root root 23 2018-09-14 17:50 ./source/ap/zsh/zsh.url -rwxr-xr-x 1 root root 11921 2018-04-23 19:29 ./source/buildlist-from-changelog.sh -drwxr-xr-x 58 root root 4096 2019-11-17 21:44 ./source/d +drwxr-xr-x 58 root root 4096 2019-11-19 06:07 ./source/d drwxr-xr-x 2 root root 4096 2019-11-01 21:32 ./source/d/Cython -rw-r--r-- 1 root root 1591931 2019-11-01 19:56 ./source/d/Cython/Cython-0.29.14.tar.lz -rwxr-xr-x 1 root root 2740 2019-09-29 23:48 ./source/d/Cython/Cython.SlackBuild @@ -6860,11 +6860,13 @@ drwxr-xr-x 2 root root 4096 2019-10-01 20:40 ./source/d/ruby -rw-r--r-- 1 root root 11265517 2019-10-01 12:04 ./source/d/ruby/ruby-2.6.5.tar.lz -rwxr-xr-x 1 root root 4795 2019-09-29 23:48 ./source/d/ruby/ruby.SlackBuild -rw-r--r-- 1 root root 837 2019-03-13 16:43 ./source/d/ruby/slack-desc -drwxr-xr-x 2 root root 4096 2019-08-16 05:10 ./source/d/rust +drwxr-xr-x 2 root root 4096 2019-11-08 19:38 ./source/d/rust +-rw-r--r-- 1 root root 899 2019-11-08 00:11 ./source/d/rust/0001-WIP-minimize-the-rust-std-component.patch.gz +-rw-r--r-- 1 root root 455 2019-11-08 04:05 ./source/d/rust/hack.diff.gz -rw-r--r-- 1 root root 300 2017-10-16 20:00 ./source/d/rust/link_libffi.diff.gz --rwxr-xr-x 1 root root 9807 2019-08-16 02:26 ./source/d/rust/rust.SlackBuild --rw-r--r-- 1 root root 1147 2019-08-16 02:28 ./source/d/rust/rust.url --rw-r--r-- 1 root root 93865060 2019-08-15 14:16 ./source/d/rust/rustc-1.37.0-src.tar.lz +-rwxr-xr-x 1 root root 10008 2019-11-08 04:06 ./source/d/rust/rust.SlackBuild +-rw-r--r-- 1 root root 1147 2019-11-07 22:22 ./source/d/rust/rust.url +-rw-r--r-- 1 root root 89233076 2019-11-07 14:00 ./source/d/rust/rustc-1.39.0-src.tar.lz -rw-r--r-- 1 root root 910 2018-02-27 06:49 ./source/d/rust/slack-desc drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/d/scons -rw-r--r-- 1 root root 497946 2019-08-08 15:13 ./source/d/scons/scons-3.1.1.tar.lz @@ -12392,8 +12394,8 @@ drwxr-xr-x 2 root root 4096 2019-11-18 18:52 ./source/x/xterm -rw-r--r-- 1 root root 971566 2019-11-18 01:50 ./source/x/xterm/xterm-351.tar.lz -rwxr-xr-x 1 root root 4903 2019-11-04 20:43 ./source/x/xterm/xterm.SlackBuild -rw-r--r-- 1 root root 38 2018-08-13 18:38 ./source/x/xterm/xterm.url -drwxr-xr-x 46 root root 4096 2019-11-10 00:23 ./source/xap --rw-r--r-- 1 root root 1257 2019-09-10 17:50 ./source/xap/FTBFSlog +drwxr-xr-x 46 root root 4096 2019-11-19 06:06 ./source/xap +-rw-r--r-- 1 root root 1471 2019-11-19 06:06 ./source/xap/FTBFSlog drwxr-xr-x 2 root root 4096 2019-10-14 18:04 ./source/xap/MPlayer -rw-r--r-- 1 root root 222707 2017-10-10 01:18 ./source/xap/MPlayer/Blue-1.13.tar.bz2 -rw-r--r-- 1 root root 5251156 2019-10-14 18:03 ./source/xap/MPlayer/MPlayer-20191014.tar.xz @@ -12406,9 +12408,9 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/xap/audacious-plugi -rwxr-xr-x 1 root root 4471 2019-09-29 23:48 ./source/xap/audacious-plugins/audacious-plugins.SlackBuild -rw-r--r-- 1 root root 868 2018-10-24 20:29 ./source/xap/audacious-plugins/slack-desc -rw-r--r-- 1 root root 497229 2018-12-26 07:27 ./source/xap/audacious/audacious-3.10.1.tar.lz --rwxr-xr-x 1 root root 4801 2019-09-29 23:48 ./source/xap/audacious/audacious.SlackBuild --rw-r--r-- 1 root root 121 2010-04-09 21:15 ./source/xap/audacious/doinst.sh.gz --rw-r--r-- 1 root root 1048 2018-10-24 20:29 ./source/xap/audacious/slack-desc +-rwxr-xr-x 1 root root 4801 2019-09-29 23:48 ./source/xap/audacious/audacious.SlackBuild +-rw-r--r-- 1 root root 121 2010-04-09 21:15 ./source/xap/audacious/doinst.sh.gz +-rw-r--r-- 1 root root 1048 2018-10-24 20:29 ./source/xap/audacious/slack-desc drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/xap/blackbox -rw-r--r-- 1 root root 175764 2009-09-03 11:39 ./source/xap/blackbox/bbkeys-0.9.1.tar.lz -rw-r--r-- 1 root root 562326 2019-09-06 13:17 ./source/xap/blackbox/blackbox-0.75.tar.lz @@ -12534,7 +12536,7 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/xap/hexchat -rwxr-xr-x 1 root root 3765 2019-09-29 23:48 ./source/xap/hexchat/hexchat.SlackBuild -rw-r--r-- 1 root root 110 2018-09-02 19:38 ./source/xap/hexchat/hexchat.url -rw-r--r-- 1 root root 718 2018-02-27 06:13 ./source/xap/hexchat/slack-desc -drwxr-xr-x 3 root root 4096 2019-10-21 18:42 ./source/xap/mozilla-firefox +drwxr-xr-x 3 root root 4096 2019-11-19 06:05 ./source/xap/mozilla-firefox drwxr-xr-x 5 root root 4096 2019-08-27 19:34 ./source/xap/mozilla-firefox/build-deps -rwxr-xr-x 1 root root 1919 2019-07-09 19:35 ./source/xap/mozilla-firefox/build-deps.sh drwxr-xr-x 2 root root 4096 2016-07-03 18:05 ./source/xap/mozilla-firefox/build-deps/autoconf @@ -12552,14 +12554,16 @@ drwxr-xr-x 2 root root 4096 2019-08-20 18:07 ./source/xap/mozilla-firefox/ -rw-r--r-- 1 root root 330 2019-07-08 18:41 ./source/xap/mozilla-firefox/ff.ui.scrollToClick.diff.gz -rw-r--r-- 1 root root 312103756 2019-10-21 09:15 ./source/xap/mozilla-firefox/firefox-68.2.0esr.source.tar.xz -rw-r--r-- 1 root root 833 2019-10-21 09:15 ./source/xap/mozilla-firefox/firefox-68.2.0esr.source.tar.xz.asc +-rw-r--r-- 1 root root 4365 2019-11-19 03:54 ./source/xap/mozilla-firefox/firefox-rust-1.39.x.patch.gz -rw-r--r-- 1 root root 327 2008-06-17 17:19 ./source/xap/mozilla-firefox/firefox.moz_plugin_path.diff.gz +-rw-r--r-- 1 root root 655 2019-11-19 04:38 ./source/xap/mozilla-firefox/firefox.node.py.patch.gz -rw-r--r-- 1 root root 462 2009-07-01 06:05 ./source/xap/mozilla-firefox/mimeTypes.rdf.gz -rw-r--r-- 1 root root 680 2009-07-01 13:28 ./source/xap/mozilla-firefox/mozilla-firefox-mimeTypes-fix.diff.gz --rwxr-xr-x 1 root root 15317 2019-10-31 17:26 ./source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +-rwxr-xr-x 1 root root 15497 2019-11-19 04:39 ./source/xap/mozilla-firefox/mozilla-firefox.SlackBuild -rw-r--r-- 1 root root 2748 2017-12-04 21:30 ./source/xap/mozilla-firefox/mozilla-firefox.desktop -rw-r--r-- 1 root root 946 2018-11-03 19:51 ./source/xap/mozilla-firefox/slack-desc -rw-r--r-- 1 root root 456 2019-07-08 18:54 ./source/xap/mozilla-firefox/unbreakdocs.diff.gz -drwxr-xr-x 5 root root 4096 2019-11-07 18:17 ./source/xap/mozilla-thunderbird +drwxr-xr-x 5 root root 4096 2019-11-19 06:06 ./source/xap/mozilla-thunderbird drwxr-xr-x 2 root root 4096 2016-07-03 18:05 ./source/xap/mozilla-thunderbird/autoconf -rw-r--r-- 1 root root 5869 2016-07-03 18:04 ./source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch.gz -rw-r--r-- 1 root root 300116 1999-01-15 21:03 ./source/xap/mozilla-thunderbird/autoconf/autoconf-2.13.tar.xz @@ -12577,18 +12581,20 @@ drwxr-xr-x 2 root root 4096 2019-08-20 18:07 ./source/xap/mozilla-thunderb -rw-r--r-- 1 root root 22516271 2019-08-15 19:24 ./source/xap/mozilla-thunderbird/build-deps/nodejs/node-v10.16.3.tar.lz -rwxr-xr-x 1 root root 2914 2019-08-27 19:46 ./source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.build -rw-r--r-- 1 root root 86 2019-07-08 21:02 ./source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.url +-rw-r--r-- 1 root root 655 2019-11-19 04:38 ./source/xap/mozilla-thunderbird/firefox.node.py.patch.gz -rw-r--r-- 1 root root 466 2019-08-28 20:34 ./source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff.gz drwxr-xr-x 2 root root 4096 2019-08-28 16:42 ./source/xap/mozilla-thunderbird/gold lrwxrwxrwx 1 root root 7 2019-08-28 16:42 ./source/xap/mozilla-thunderbird/gold/gold -> ld.gold lrwxrwxrwx 1 root root 7 2019-08-28 16:40 ./source/xap/mozilla-thunderbird/gold/ld -> ld.gold -rwxr-xr-x 1 root root 281 2019-08-28 19:15 ./source/xap/mozilla-thunderbird/gold/ld.gold -rw-r--r-- 1 root root 312 2012-03-28 18:01 ./source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch.gz --rwxr-xr-x 1 root root 13080 2019-10-31 17:21 ./source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +-rwxr-xr-x 1 root root 13264 2019-11-19 04:42 ./source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild -rw-r--r-- 1 root root 3378 2005-03-08 05:13 ./source/xap/mozilla-thunderbird/mozilla-thunderbird.desktop -rw-r--r-- 1 root root 1130 2018-02-27 06:47 ./source/xap/mozilla-thunderbird/slack-desc -rw-r--r-- 1 root root 330 2019-08-27 16:35 ./source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff.gz -rw-r--r-- 1 root root 334809520 2019-11-07 12:46 ./source/xap/mozilla-thunderbird/thunderbird-68.2.2.source.tar.xz -rw-r--r-- 1 root root 833 2019-11-07 12:46 ./source/xap/mozilla-thunderbird/thunderbird-68.2.2.source.tar.xz.asc +-rw-r--r-- 1 root root 4369 2019-11-19 03:56 ./source/xap/mozilla-thunderbird/thunderbird-rust-1.39.x.patch.gz -rw-r--r-- 1 root root 456 2019-07-08 18:54 ./source/xap/mozilla-thunderbird/unbreakdocs.diff.gz drwxr-xr-x 2 root root 4096 2019-10-09 16:45 ./source/xap/network-manager-applet -rw-r--r-- 1 root root 207 2012-08-10 23:59 ./source/xap/network-manager-applet/doinst.sh.gz @@ -12967,13 +12973,13 @@ drwxr-xr-x 2 root root 4096 2019-02-17 22:03 ./source/y/bsd-games/patches -rw-r--r-- 1 root root 313 2019-02-17 22:07 ./source/y/bsd-games/patches/bsd-games.fortunepath.diff.gz -rw-r--r-- 1 root root 1960 2006-09-09 00:47 ./source/y/bsd-games/patches/bsd-games.pom.diff.gz -rw-r--r-- 1 root root 1065 2019-02-17 22:28 ./source/y/bsd-games/slack-desc -drwxr-xr-x 4 root root 4096 2019-11-18 05:13 ./testing --rw-r--r-- 1 root root 4368 2019-11-18 05:13 ./testing/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-11-18 05:13 ./testing/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 5582 2019-11-18 05:12 ./testing/FILE_LIST --rw-r--r-- 1 root root 2116545 2019-11-18 05:12 ./testing/MANIFEST.bz2 --rw-r--r-- 1 root root 4050 2019-11-18 05:13 ./testing/PACKAGES.TXT -drwxr-xr-x 2 root root 4096 2019-11-18 05:12 ./testing/packages +drwxr-xr-x 4 root root 4096 2019-11-19 06:26 ./testing +-rw-r--r-- 1 root root 3675 2019-11-19 06:26 ./testing/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-11-19 06:26 ./testing/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 4665 2019-11-19 06:26 ./testing/FILE_LIST +-rw-r--r-- 1 root root 1107962 2019-11-19 06:26 ./testing/MANIFEST.bz2 +-rw-r--r-- 1 root root 3455 2019-11-19 06:26 ./testing/PACKAGES.TXT +drwxr-xr-x 2 root root 4096 2019-11-19 06:07 ./testing/packages -rw-r--r-- 1 root root 624 2019-11-18 04:54 ./testing/packages/kernel-generic-5.4.0_rc8-x86_64-1.txt -rw-r--r-- 1 root root 6905276 2019-11-18 04:54 ./testing/packages/kernel-generic-5.4.0_rc8-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-11-18 04:54 ./testing/packages/kernel-generic-5.4.0_rc8-x86_64-1.txz.asc @@ -12989,10 +12995,7 @@ drwxr-xr-x 2 root root 4096 2019-11-18 05:12 ./testing/packages -rw-r--r-- 1 root root 317 2019-11-18 04:47 ./testing/packages/kernel-source-5.4.0_rc8-noarch-1.txt -rw-r--r-- 1 root root 109825272 2019-11-18 04:47 ./testing/packages/kernel-source-5.4.0_rc8-noarch-1.txz -rw-r--r-- 1 root root 163 2019-11-18 04:47 ./testing/packages/kernel-source-5.4.0_rc8-noarch-1.txz.asc --rw-r--r-- 1 root root 426 2019-11-08 05:22 ./testing/packages/rust-1.39.0-x86_64-1.txt --rw-r--r-- 1 root root 46848056 2019-11-08 05:22 ./testing/packages/rust-1.39.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-11-08 05:22 ./testing/packages/rust-1.39.0-x86_64-1.txz.asc -drwxr-xr-x 4 root root 4096 2019-11-15 20:11 ./testing/source +drwxr-xr-x 3 root root 4096 2019-11-19 06:07 ./testing/source drwxr-xr-x 4 root root 4096 2019-11-18 01:42 ./testing/source/k -rwxr-xr-x 1 root root 7861 2019-11-18 01:18 ./testing/source/k/build-all-kernels.sh drwxr-xr-x 2 root root 4096 2019-11-18 02:38 ./testing/source/k/kernel-configs @@ -13019,14 +13022,6 @@ drwxr-xr-x 2 root root 4096 2018-03-05 18:29 ./testing/source/k/slack-desc -rw-r--r-- 1 root root 778 2018-02-27 06:16 ./testing/source/k/slack-desc/slack-desc.kernel-source -rw-r--r-- 1 root root 778 2018-02-27 06:16 ./testing/source/k/slack-desc/slack-desc.kernel-source.vanilla -rw-r--r-- 1 root root 1000 2018-03-05 08:27 ./testing/source/k/slack-desc/slack-desc.kernel-template -drwxr-xr-x 2 root root 4096 2019-11-08 19:38 ./testing/source/rust --rw-r--r-- 1 root root 899 2019-11-08 00:11 ./testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch.gz --rw-r--r-- 1 root root 455 2019-11-08 04:05 ./testing/source/rust/hack.diff.gz --rw-r--r-- 1 root root 300 2017-10-16 20:00 ./testing/source/rust/link_libffi.diff.gz --rwxr-xr-x 1 root root 10008 2019-11-08 04:06 ./testing/source/rust/rust.SlackBuild --rw-r--r-- 1 root root 1147 2019-11-07 22:22 ./testing/source/rust/rust.url --rw-r--r-- 1 root root 89233076 2019-11-07 14:00 ./testing/source/rust/rustc-1.39.0-src.tar.lz --rw-r--r-- 1 root root 910 2018-02-27 06:49 ./testing/source/rust/slack-desc drwxr-xr-x 2 root root 4096 2019-11-15 01:12 ./usb-and-pxe-installers -rw-r--r-- 1 root root 31203 2011-03-21 21:21 ./usb-and-pxe-installers/README_PXE.TXT -rw-r--r-- 1 root root 9197 2013-09-25 04:33 ./usb-and-pxe-installers/README_USB.TXT diff --git a/recompress.sh b/recompress.sh index 661dccd2..effcdb58 100755 --- a/recompress.sh +++ b/recompress.sh @@ -57,7 +57,9 @@ gzip ./source/d/llvm/clang.toolchains.i586.triple.diff gzip ./source/d/opencl-headers/cl.hpp gzip ./source/d/opencl-headers/cl2.hpp gzip ./source/d/opencl-headers/opencl.no.pragma.for.default.version.diff +gzip ./source/d/rust/hack.diff gzip ./source/d/rust/link_libffi.diff +gzip ./source/d/rust/0001-WIP-minimize-the-rust-std-component.patch gzip ./source/d/vala/disable-graphviz.patch gzip ./source/d/vala/no.gvc-compat.c.diff gzip ./source/d/mercurial/doinst.sh @@ -1032,9 +1034,11 @@ gzip ./source/l/qca/Add_support_for_OpenSSL_1.1.0.diff gzip ./source/xap/hexchat/doinst.sh gzip ./source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch gzip ./source/xap/mozilla-thunderbird/build-deps/autoconf/autoconf-2.13-consolidated_fixes-1.patch +gzip ./source/xap/mozilla-thunderbird/thunderbird-rust-1.39.x.patch gzip ./source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff gzip ./source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch gzip ./source/xap/mozilla-thunderbird/unbreakdocs.diff +gzip ./source/xap/mozilla-thunderbird/firefox.node.py.patch gzip ./source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff gzip ./source/xap/xmms/xmms.alsa.default.diff gzip ./source/xap/xmms/xmms.gtk.doublesize.diff @@ -1148,6 +1152,8 @@ gzip ./source/xap/mozilla-firefox/build-deps/autoconf/autoconf-2.13-consolidated gzip ./source/xap/mozilla-firefox/mimeTypes.rdf gzip ./source/xap/mozilla-firefox/mozilla-firefox-mimeTypes-fix.diff gzip ./source/xap/mozilla-firefox/unbreakdocs.diff +gzip ./source/xap/mozilla-firefox/firefox-rust-1.39.x.patch +gzip ./source/xap/mozilla-firefox/firefox.node.py.patch gzip ./source/xap/electricsheep/electricsheep.mplayer.diff gzip ./source/installer/sources/initrd/etc/keymaps.tar gzip ./source/x/liberation-fonts-ttf/doinst.sh @@ -1212,9 +1218,6 @@ gzip ./source/x/libglvnd/patches/update-gl-h-to-match-mesa.patch gzip ./source/x/libglvnd/patches/193.patch gzip ./source/x/libglvnd/patches/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch gzip ./source/x/xcm/xcm.udev.rules.diff -gzip ./testing/source/rust/hack.diff -gzip ./testing/source/rust/link_libffi.diff -gzip ./testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch gzip ./pasture/source/php/php-fpm.conf.diff gzip ./pasture/source/php/doinst.sh gzip ./pasture/source/php/PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch diff --git a/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch b/source/d/rust/0001-WIP-minimize-the-rust-std-component.patch index e46a7265..e46a7265 100644 --- a/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch +++ b/source/d/rust/0001-WIP-minimize-the-rust-std-component.patch diff --git a/testing/source/rust/hack.diff b/source/d/rust/hack.diff index c5031fb0..c5031fb0 100644 --- a/testing/source/rust/hack.diff +++ b/source/d/rust/hack.diff diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 7e6b3dbc..2dee9b21 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2017 Andrew Clemons, Wellington, New Zealand -# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2017 Stuart Winter # All rights reserved. # @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.37.0} +VERSION=${VERSION:-1.39.0} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. @@ -34,9 +34,9 @@ BUILD=${BUILD:-1} SYSTEM_LLVM=${SYSTEM_LLVM:-YES} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.36.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2019-07-04} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.37.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.38.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2019-09-26} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.39.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: @@ -148,6 +148,10 @@ if [ "${SYSTEM_LLVM}" = "YES" ]; then zcat $CWD/link_libffi.diff.gz | patch -p1 --verbose || exit 1 fi +# Try to debloat the build: +zcat $CWD/0001-WIP-minimize-the-rust-std-component.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/hack.diff.gz | patch -p1 --verbose || exit 1 + if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then # rust requires bootstrapping with the previous rust version. # versions are defined in src/stage0.txt. @@ -165,6 +169,7 @@ fi cat << EOF > config.toml [llvm] ccache = "/usr/bin/ccache" +link-shared = true [build] build = "$BARCH-unknown-linux-$BABI" @@ -213,9 +218,9 @@ fi chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ export PKG_CONFIG_ALLOW_CROSS=1 @@ -263,7 +268,7 @@ sed -i "s,/tmp/package-rust/,/,g" $PKG/usr/lib$LIBDIRSUFFIX/rustlib/install.log gzip -9 $PKG/usr/lib$LIBDIRSUFFIX/rustlib/manifest-* # Correct permissions on shared libraries: -find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \; +find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \+ # Evidently there are a lot of duplicated libraries in this tree, so let's # try to save some space: @@ -280,7 +285,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr done # Compress man pages: -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Add some documentation: diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index de0c3c01..a6838aff 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.37.0-src.tar.gz +lftpget https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.gz gzip -d rustc-*tar.gz plzip -9 -v rustc-*tar @@ -12,12 +12,12 @@ plzip -9 -v rustc-*tar exit 0 # i686 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-07-04/cargo-0.37.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-07-04/rust-std-1.36.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-07-04/rustc-1.36.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-i686-unknown-linux-gnu.tar.gz # x86_64 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-07-04/cargo-0.37.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-07-04/rust-std-1.36.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-07-04/rustc-1.36.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-x86_64-unknown-linux-gnu.tar.gz diff --git a/source/xap/FTBFSlog b/source/xap/FTBFSlog index 4661e1ad..c732de9c 100644 --- a/source/xap/FTBFSlog +++ b/source/xap/FTBFSlog @@ -1,3 +1,7 @@ +Tue Nov 19 06:05:34 UTC 2019 + mozilla-firefox: Patch for rust-1.39.0 and node.js related build failure. + mozilla-thunderbird: Patch for rust-1.39.0 and node.js related build failure. ++--------------------------+ Tue Sep 10 16:55:23 UTC 2019 gftp: patch to fix breakage from removal of stropts.h in glibc-2.30. mozilla-firefox: Compile with gcc/g++ for glibc-2.30. diff --git a/source/xap/mozilla-firefox/firefox-rust-1.39.x.patch b/source/xap/mozilla-firefox/firefox-rust-1.39.x.patch new file mode 100644 index 00000000..9494776e --- /dev/null +++ b/source/xap/mozilla-firefox/firefox-rust-1.39.x.patch @@ -0,0 +1,172 @@ +Source: Gentoo + +Based on https://github.com/rust-lang/rust/issues/64710 + +--- third_party/rust/bindgen/.cargo-checksum.json ++++ third_party/rust/bindgen/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"} +\ No newline at end of file ++{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"} +\ No newline at end of file +--- third_party/rust/bindgen/src/ir/analysis/has_vtable.rs ++++ third_party/rust/bindgen/src/ir/analysis/has_vtable.rs +@@ -9,17 +9,17 @@ use std::ops; + use {HashMap, Entry}; + + /// The result of the `HasVtableAnalysis` for an individual item. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum HasVtableResult { +- /// The item has a vtable, but the actual vtable pointer is in a base +- /// member. +- BaseHasVtable, ++ /// The item does not have a vtable pointer. ++ No, + + /// The item has a vtable and the actual vtable pointer is within this item. + SelfHasVtable, + +- /// The item does not have a vtable pointer. +- No ++ /// The item has a vtable, but the actual vtable pointer is in a base ++ /// member. ++ BaseHasVtable, + } + + impl Default for HasVtableResult { +@@ -28,21 +28,6 @@ impl Default for HasVtableResult { + } + } + +-impl cmp::PartialOrd for HasVtableResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::HasVtableResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (BaseHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, BaseHasVtable) => Some(cmp::Ordering::Less), +- (SelfHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, SelfHasVtable) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } +- } +-} +- + impl HasVtableResult { + /// Take the least upper bound of `self` and `rhs`. + pub fn join(self, rhs: Self) -> Self { +--- third_party/rust/bindgen/src/ir/analysis/sizedness.rs ++++ third_party/rust/bindgen/src/ir/analysis/sizedness.rs +@@ -22,13 +22,14 @@ use {HashMap, Entry}; + /// + /// We initially assume that all types are `ZeroSized` and then update our + /// understanding as we learn more about each type. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum SizednessResult { +- /// Has some size that is known to be greater than zero. That doesn't mean +- /// it has a static size, but it is not zero sized for sure. In other words, +- /// it might contain an incomplete array or some other dynamically sized +- /// type. +- NonZeroSized, ++ /// The type is zero-sized. ++ /// ++ /// This means that if it is a C++ type, and is not being used as a base ++ /// member, then we must add an `_address` byte to enforce the ++ /// unique-address-per-distinct-object-instance rule. ++ ZeroSized, + + /// Whether this type is zero-sized or not depends on whether a type + /// parameter is zero-sized or not. +@@ -52,12 +53,11 @@ pub enum SizednessResult { + /// https://github.com/rust-lang-nursery/rust-bindgen/issues/586 + DependsOnTypeParam, + +- /// The type is zero-sized. +- /// +- /// This means that if it is a C++ type, and is not being used as a base +- /// member, then we must add an `_address` byte to enforce the +- /// unique-address-per-distinct-object-instance rule. +- ZeroSized, ++ /// Has some size that is known to be greater than zero. That doesn't mean ++ /// it has a static size, but it is not zero sized for sure. In other words, ++ /// it might contain an incomplete array or some other dynamically sized ++ /// type. ++ NonZeroSized, + } + + impl Default for SizednessResult { +@@ -66,21 +66,6 @@ impl Default for SizednessResult { + } + } + +-impl cmp::PartialOrd for SizednessResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::SizednessResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (NonZeroSized, _) => Some(cmp::Ordering::Greater), +- (_, NonZeroSized) => Some(cmp::Ordering::Less), +- (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater), +- (_, DependsOnTypeParam) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } +- } +-} +- + impl SizednessResult { + /// Take the least upper bound of `self` and `rhs`. + pub fn join(self, rhs: Self) -> Self { +--- third_party/rust/bindgen/src/ir/derive.rs ++++ third_party/rust/bindgen/src/ir/derive.rs +@@ -92,10 +92,10 @@ pub trait CanDeriveOrd { + /// + /// Initially we assume that we can derive trait for all types and then + /// update our understanding as we learn more about each type. +-#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)] ++#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] + pub enum CanDerive { +- /// No, we cannot. +- No, ++ /// Yes, we can derive automatically. ++ Yes, + + /// The only thing that stops us from automatically deriving is that + /// array with more than maximum number of elements is used. +@@ -103,8 +103,8 @@ pub enum CanDerive { + /// This means we probably can "manually" implement such trait. + Manually, + +- /// Yes, we can derive automatically. +- Yes, ++ /// No, we cannot. ++ No, + } + + impl Default for CanDerive { +@@ -113,22 +113,6 @@ impl Default for CanDerive { + } + } + +-impl cmp::PartialOrd for CanDerive { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::CanDerive::*; +- +- let ordering = match (*self, *rhs) { +- (x, y) if x == y => cmp::Ordering::Equal, +- (No, _) => cmp::Ordering::Greater, +- (_, No) => cmp::Ordering::Less, +- (Manually, _) => cmp::Ordering::Greater, +- (_, Manually) => cmp::Ordering::Less, +- _ => unreachable!() +- }; +- Some(ordering) +- } +-} +- + impl CanDerive { + /// Take the least upper bound of `self` and `rhs`. + pub fn join(self, rhs: Self) -> Self { diff --git a/source/xap/mozilla-firefox/firefox.node.py.patch b/source/xap/mozilla-firefox/firefox.node.py.patch new file mode 100644 index 00000000..11e2b843 --- /dev/null +++ b/source/xap/mozilla-firefox/firefox.node.py.patch @@ -0,0 +1,46 @@ + +diff --git a/python/mozbuild/mozbuild/action/node.py b/python/mozbuild/mozbuild/action/node.py +--- a/python/mozbuild/mozbuild/action/node.py ++++ b/python/mozbuild/mozbuild/action/node.py +@@ -47,24 +47,35 @@ def execute_node_cmd(node_cmd_list): + printed to stderr instead. + """ + + try: + printable_cmd = ' '.join(pipes.quote(arg) for arg in node_cmd_list) + print('Executing "{}"'.format(printable_cmd), file=sys.stderr) + sys.stderr.flush() + +- output = subprocess.check_output(node_cmd_list) ++ # We need to redirect stderr to a pipe because ++ # https://github.com/nodejs/node/issues/14752 causes issues with make. ++ proc = subprocess.Popen( ++ node_cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE) ++ ++ stdout, stderr = proc.communicate() ++ retcode = proc.wait() ++ ++ if retcode != 0: ++ print(stderr, file=sys.stderr) ++ sys.stderr.flush() ++ sys.exit(retcode) + + # Process the node script output + # + # XXX Starting with an empty list means that node scripts can + # (intentionally or inadvertently) remove deps. Do we want this? + deps = [] +- for line in output.splitlines(): ++ for line in stdout.splitlines(): + if 'dep:' in line: + deps.append(line.replace('dep:', '')) + else: + print(line, file=sys.stderr) + sys.stderr.flush() + + return set(deps) + + + + + diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index c36e23a6..c255012e 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -201,6 +201,10 @@ zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 # Fix building with latest Rust: zcat $CWD/unbreakdocs.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/firefox-rust-1.39.x.patch.gz | patch -p0 --verbose || exit 1 + +# Fix a build failure caused by node.js: +zcat $CWD/firefox.node.py.patch.gz | patch -p1 --verbose || exit 1 # Fetch localization, if requested # https://bugzilla.mozilla.org/show_bug.cgi?id=1256955 diff --git a/source/xap/mozilla-thunderbird/firefox.node.py.patch b/source/xap/mozilla-thunderbird/firefox.node.py.patch new file mode 100644 index 00000000..11e2b843 --- /dev/null +++ b/source/xap/mozilla-thunderbird/firefox.node.py.patch @@ -0,0 +1,46 @@ + +diff --git a/python/mozbuild/mozbuild/action/node.py b/python/mozbuild/mozbuild/action/node.py +--- a/python/mozbuild/mozbuild/action/node.py ++++ b/python/mozbuild/mozbuild/action/node.py +@@ -47,24 +47,35 @@ def execute_node_cmd(node_cmd_list): + printed to stderr instead. + """ + + try: + printable_cmd = ' '.join(pipes.quote(arg) for arg in node_cmd_list) + print('Executing "{}"'.format(printable_cmd), file=sys.stderr) + sys.stderr.flush() + +- output = subprocess.check_output(node_cmd_list) ++ # We need to redirect stderr to a pipe because ++ # https://github.com/nodejs/node/issues/14752 causes issues with make. ++ proc = subprocess.Popen( ++ node_cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE) ++ ++ stdout, stderr = proc.communicate() ++ retcode = proc.wait() ++ ++ if retcode != 0: ++ print(stderr, file=sys.stderr) ++ sys.stderr.flush() ++ sys.exit(retcode) + + # Process the node script output + # + # XXX Starting with an empty list means that node scripts can + # (intentionally or inadvertently) remove deps. Do we want this? + deps = [] +- for line in output.splitlines(): ++ for line in stdout.splitlines(): + if 'dep:' in line: + deps.append(line.replace('dep:', '')) + else: + print(line, file=sys.stderr) + sys.stderr.flush() + + return set(deps) + + + + + diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index 43a45422..ef593e77 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -178,6 +178,10 @@ zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 # Fix building with latest Rust: zcat $CWD/unbreakdocs.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/thunderbird-rust-1.39.x.patch.gz | patch -p0 --verbose || exit 1 + +# Fix a build failure caused by node.js: +zcat $CWD/firefox.node.py.patch.gz | patch -p1 --verbose || exit 1 # Bypass a test that fails the build: zcat $CWD/gkrust.a.no.networking.check.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/xap/mozilla-thunderbird/thunderbird-rust-1.39.x.patch b/source/xap/mozilla-thunderbird/thunderbird-rust-1.39.x.patch new file mode 100644 index 00000000..9494776e --- /dev/null +++ b/source/xap/mozilla-thunderbird/thunderbird-rust-1.39.x.patch @@ -0,0 +1,172 @@ +Source: Gentoo + +Based on https://github.com/rust-lang/rust/issues/64710 + +--- third_party/rust/bindgen/.cargo-checksum.json ++++ third_party/rust/bindgen/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"} +\ No newline at end of file ++{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"} +\ No newline at end of file +--- third_party/rust/bindgen/src/ir/analysis/has_vtable.rs ++++ third_party/rust/bindgen/src/ir/analysis/has_vtable.rs +@@ -9,17 +9,17 @@ use std::ops; + use {HashMap, Entry}; + + /// The result of the `HasVtableAnalysis` for an individual item. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum HasVtableResult { +- /// The item has a vtable, but the actual vtable pointer is in a base +- /// member. +- BaseHasVtable, ++ /// The item does not have a vtable pointer. ++ No, + + /// The item has a vtable and the actual vtable pointer is within this item. + SelfHasVtable, + +- /// The item does not have a vtable pointer. +- No ++ /// The item has a vtable, but the actual vtable pointer is in a base ++ /// member. ++ BaseHasVtable, + } + + impl Default for HasVtableResult { +@@ -28,21 +28,6 @@ impl Default for HasVtableResult { + } + } + +-impl cmp::PartialOrd for HasVtableResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::HasVtableResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (BaseHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, BaseHasVtable) => Some(cmp::Ordering::Less), +- (SelfHasVtable, _) => Some(cmp::Ordering::Greater), +- (_, SelfHasVtable) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } +- } +-} +- + impl HasVtableResult { + /// Take the least upper bound of `self` and `rhs`. + pub fn join(self, rhs: Self) -> Self { +--- third_party/rust/bindgen/src/ir/analysis/sizedness.rs ++++ third_party/rust/bindgen/src/ir/analysis/sizedness.rs +@@ -22,13 +22,14 @@ use {HashMap, Entry}; + /// + /// We initially assume that all types are `ZeroSized` and then update our + /// understanding as we learn more about each type. +-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] ++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] + pub enum SizednessResult { +- /// Has some size that is known to be greater than zero. That doesn't mean +- /// it has a static size, but it is not zero sized for sure. In other words, +- /// it might contain an incomplete array or some other dynamically sized +- /// type. +- NonZeroSized, ++ /// The type is zero-sized. ++ /// ++ /// This means that if it is a C++ type, and is not being used as a base ++ /// member, then we must add an `_address` byte to enforce the ++ /// unique-address-per-distinct-object-instance rule. ++ ZeroSized, + + /// Whether this type is zero-sized or not depends on whether a type + /// parameter is zero-sized or not. +@@ -52,12 +53,11 @@ pub enum SizednessResult { + /// https://github.com/rust-lang-nursery/rust-bindgen/issues/586 + DependsOnTypeParam, + +- /// The type is zero-sized. +- /// +- /// This means that if it is a C++ type, and is not being used as a base +- /// member, then we must add an `_address` byte to enforce the +- /// unique-address-per-distinct-object-instance rule. +- ZeroSized, ++ /// Has some size that is known to be greater than zero. That doesn't mean ++ /// it has a static size, but it is not zero sized for sure. In other words, ++ /// it might contain an incomplete array or some other dynamically sized ++ /// type. ++ NonZeroSized, + } + + impl Default for SizednessResult { +@@ -66,21 +66,6 @@ impl Default for SizednessResult { + } + } + +-impl cmp::PartialOrd for SizednessResult { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::SizednessResult::*; +- +- match (*self, *rhs) { +- (x, y) if x == y => Some(cmp::Ordering::Equal), +- (NonZeroSized, _) => Some(cmp::Ordering::Greater), +- (_, NonZeroSized) => Some(cmp::Ordering::Less), +- (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater), +- (_, DependsOnTypeParam) => Some(cmp::Ordering::Less), +- _ => unreachable!(), +- } +- } +-} +- + impl SizednessResult { + /// Take the least upper bound of `self` and `rhs`. + pub fn join(self, rhs: Self) -> Self { +--- third_party/rust/bindgen/src/ir/derive.rs ++++ third_party/rust/bindgen/src/ir/derive.rs +@@ -92,10 +92,10 @@ pub trait CanDeriveOrd { + /// + /// Initially we assume that we can derive trait for all types and then + /// update our understanding as we learn more about each type. +-#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)] ++#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] + pub enum CanDerive { +- /// No, we cannot. +- No, ++ /// Yes, we can derive automatically. ++ Yes, + + /// The only thing that stops us from automatically deriving is that + /// array with more than maximum number of elements is used. +@@ -103,8 +103,8 @@ pub enum CanDerive { + /// This means we probably can "manually" implement such trait. + Manually, + +- /// Yes, we can derive automatically. +- Yes, ++ /// No, we cannot. ++ No, + } + + impl Default for CanDerive { +@@ -113,22 +113,6 @@ impl Default for CanDerive { + } + } + +-impl cmp::PartialOrd for CanDerive { +- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { +- use self::CanDerive::*; +- +- let ordering = match (*self, *rhs) { +- (x, y) if x == y => cmp::Ordering::Equal, +- (No, _) => cmp::Ordering::Greater, +- (_, No) => cmp::Ordering::Less, +- (Manually, _) => cmp::Ordering::Greater, +- (_, Manually) => cmp::Ordering::Less, +- _ => unreachable!() +- }; +- Some(ordering) +- } +-} +- + impl CanDerive { + /// Take the least upper bound of `self` and `rhs`. + pub fn join(self, rhs: Self) -> Self { diff --git a/testing/source/rust/link_libffi.diff b/testing/source/rust/link_libffi.diff deleted file mode 100644 index 38e0113e..00000000 --- a/testing/source/rust/link_libffi.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur rustc-1.21.0-src.bak/src/librustc_llvm/build.rs rustc-1.21.0-src/src/librustc_llvm/build.rs ---- rustc-1.21.0-src.bak/src/librustc_llvm/build.rs 2017-10-10 09:04:51.000000000 +1300 -+++ rustc-1.21.0-src/src/librustc_llvm/build.rs 2017-10-14 15:28:56.761081727 +1300 -@@ -221,6 +221,8 @@ - println!("cargo:rustc-link-lib={}={}", kind, name); - } - -+ println!("cargo:rustc-link-lib=dylib=ffi"); -+ - // LLVM ldflags - // - // If we're a cross-compile of LLVM then unfortunately we can't trust these diff --git a/testing/source/rust/rust.SlackBuild b/testing/source/rust/rust.SlackBuild deleted file mode 100755 index 2dee9b21..00000000 --- a/testing/source/rust/rust.SlackBuild +++ /dev/null @@ -1,304 +0,0 @@ -#!/bin/bash - -# Copyright 2017 Andrew Clemons, Wellington, New Zealand -# Copyright 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA -# Copyright 2017 Stuart Winter -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=rust -SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.39.0} -BUILD=${BUILD:-1} - -# Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. -# YES is probably better (when it works...) -SYSTEM_LLVM=${SYSTEM_LLVM:-YES} - -# Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.38.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2019-09-26} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.39.0} -CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} - -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i686 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac -fi -unset MARCH - -# For compiling i686 under an x86_64 kernel: -if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then - ARCH=i686 -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -# if you already have rust and cargo installed, you can bootstrap from the -# previous version. -if [ "$LOCAL_BOOTSTRAP" = "" ] && [ -x /usr/bin/cargo ] && [ -x /usr/bin/rustc ] ; then - LOCAL_BOOTSTRAP=yes -fi - -# https://forge.rust-lang.org/platform-support.html -# Bootstrapping ARCH: -if [ "$ARCH" = "i586" ]; then - if [ "$LOCAL_BOOTSTRAP" = "yes" ] ; then - if rustc -Vv | grep host | grep i586 > /dev/null ; then - BARCH="$ARCH" - else - BARCH="i686" - - if case "$( uname -m )" in i586) true ;; *) false ;; esac ; then - echo "rust must be bootstrapped from an i686 machine" - exit 1 - fi - fi - else - # i586 must be built on a i686 machine, since the bootstrap compiler is i686 - BARCH="i686" - - if case "$( uname -m )" in i586) true ;; *) false ;; esac ; then - echo "rust must be bootstrapped from an i686 machine" - exit 1 - fi - fi - - TARCH="$ARCH" -elif [ "$ARCH" = "armv7hl" ]; then - BARCH="armv7" - TARCH="$BARCH" -else - BARCH="$ARCH" - TARCH="$ARCH" -fi - -# Bootstrapping ABI: -if [ "$ARCH" = "armv7hl" ]; then - BABI="gnueabihf" -else - BABI="gnu" -fi - -TMP=${TMP:-/tmp} -OUTPUT=${OUTPUT:-/tmp} -PKG=$TMP/package-$PKGNAM - -# Not needed, as the build will automatically use as many jobs as there are -# cores. -#NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION-src -tar xvf $CWD/$SRCNAM-$VERSION-src.tar.?z || exit 1 -cd $SRCNAM-$VERSION-src || exit 1 - -# Link with -lffi in case of using system LLVM: -if [ "${SYSTEM_LLVM}" = "YES" ]; then - zcat $CWD/link_libffi.diff.gz | patch -p1 --verbose || exit 1 -fi - -# Try to debloat the build: -zcat $CWD/0001-WIP-minimize-the-rust-std-component.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/hack.diff.gz | patch -p1 --verbose || exit 1 - -if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then - # rust requires bootstrapping with the previous rust version. - # versions are defined in src/stage0.txt. - mkdir -p build/cache/$RSTAGE0_DIR - cp $CWD/$PKGNAM-std-$RSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z \ - $CWD/$SRCNAM-$RSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z \ - build/cache/$RSTAGE0_DIR - mkdir -p build/cache/$CSTAGE0_DIR - cp $CWD/cargo-$CSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z build/cache/$CSTAGE0_DIR -fi - -# Build configuration. We'll go ahead and build with rpath because it may be -# needed during the build, and then we'll strip the rpaths out of the -# binaries later. -cat << EOF > config.toml -[llvm] -ccache = "/usr/bin/ccache" -link-shared = true - -[build] -build = "$BARCH-unknown-linux-$BABI" -host = ["$TARCH-unknown-linux-$BABI"] -target = ["$TARCH-unknown-linux-$BABI"] -submodules = false -vendor = true -extended = true - -[install] -prefix = "/usr" -docdir = "doc/rust-$VERSION" -libdir = "lib$LIBDIRSUFFIX" -mandir = "man" - -[rust] -codegen-units = 0 -channel = "stable" -rpath = true -codegen-tests = false -ignore-git = true - -EOF - -if [ "${SYSTEM_LLVM}" = "YES" ]; then - cat << EOF >> config.toml -# Add this stuff to build with the system LLVM: -[target.i586-unknown-linux-gnu] -llvm-config = "/usr/bin/llvm-config" - -[target.i686-unknown-linux-gnu] -llvm-config = "/usr/bin/llvm-config" - -[target.x86_64-unknown-linux-gnu] -llvm-config = "/usr/bin/llvm-config" - -[target.armv7-unknown-linux-gnueabihf] -llvm-config = "/usr/bin/llvm-config" -EOF -fi - -if [ "$LOCAL_BOOTSTRAP" = "yes" ] ; then - sed -i "s|^\(extended = true\)$|\1\nrustc = \"/usr/bin/rustc\"\ncargo = \"/usr/bin/cargo\"|" config.toml -fi - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -export PKG_CONFIG_ALLOW_CROSS=1 - -if [ "$BARCH" = "i586" ] ; then - # when bootstrapping from i586 (rust already installed), also build a i686 - # rustlib: - sed -i 's/^target =.*$/target = ["i686-unknown-linux-gnu"]/' config.toml -elif [ "$BARCH" = "i686" ] ; then - if [ "$TARCH" = "i586" ] ; then - # this will cause some messages like: - # warning: redundant linker flag specified for library `m` - # but will keep the build from falling over when doing the stage1 compiler - # linking for the i586 compiler. seems the correct flags don't get passed - # through and we end up failures like: - # error: linking with `clang` failed: exit code: 1 - # /tmp/SBo/rustc-1.20.0-src/build/i686-unknown-linux-gnu/stage1-rustc/i586-unknown-linux-gnu/release/deps/librustc_llvm-4ab259c9aed547db.so: undefined reference to `xxx` - export RUSTFLAGS="$RUSTFLAGS -C link-args=-lrt -ldl -lcurses -lpthread -lz -lm" - fi -fi - -if [ "$ARCH" = "armv7hl" ] ; then - python x.py dist -else - # README.md says gcc 4.7 / clang 3.x or later needed - # but building fails for me with GCC 5.3 from slackware 14.2 - export CC=clang - export CXX=clang++ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - python x.py dist || exit 1 -fi - -DESTDIR=$PKG python x.py install || exit 1 - -# Eh, none of this is all that big. Might as well leave it around as a -# reference. -#rm -f $PKG/usr/lib$LIBDIRSUFFIX/rustlib/components -#rm -f $PKG/usr/lib$LIBDIRSUFFIX/rustlib/install.log -#rm -f $PKG/usr/lib$LIBDIRSUFFIX/rustlib/manifest-* -#rm -f $PKG/usr/lib$LIBDIRSUFFIX/rustlib/rust-installer-version -#rm -f $PKG/usr/lib$LIBDIRSUFFIX/rustlib/uninstall.sh -# Make sure the paths are correct, though: -sed -i "s,/tmp/package-rust/,/,g" $PKG/usr/lib$LIBDIRSUFFIX/rustlib/install.log $PKG/usr/lib$LIBDIRSUFFIX/rustlib/manifest-* -# And a little compression doesn't hurt either: -gzip -9 $PKG/usr/lib$LIBDIRSUFFIX/rustlib/manifest-* - -# Correct permissions on shared libraries: -find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \+ - -# Evidently there are a lot of duplicated libraries in this tree, so let's -# try to save some space: -( cd $PKG/usr/lib${LIBDIRSUFFIX}/rustlib/*-linux-gnu/lib && for file in *.so ; do if cmp -s $file ../../../$file ; then ln -sf ../../../$file .; fi; done ) - -# Strip ELF objects: -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# Remove any compiled-in RPATHs: -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | while read elfobject ; do - patchelf --remove-rpath $elfobject || exit 1 -done - -# Compress man pages: -find $PKG/usr/man -type f -exec gzip -9 {} \+ -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -# Add some documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a *.md COPYRIGHT* COPYING* LICENSE* $PKG/usr/doc/$PKGNAM-$VERSION -# Include licenses from third party vendors: -mkdir $PKG/usr/doc/$PKGNAM-$VERSION/vendor -( cd src/vendor - tar cf - $(find . -maxdepth 2 | grep -e README -e LICENSE -e COPYING -e CHANGELOG -e PERFORMANCE -e UPGRADE ) | ( cd $PKG/usr/doc/$PKGNAM-$VERSION/vendor ; tar xf - ) -) - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/testing/source/rust/rust.url b/testing/source/rust/rust.url deleted file mode 100644 index a6838aff..00000000 --- a/testing/source/rust/rust.url +++ /dev/null @@ -1,23 +0,0 @@ -# Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.gz -gzip -d rustc-*tar.gz -plzip -9 -v rustc-*tar - -# Please note that the bootstrap binary packages listed below might not be kept -# updated for later versions. The Rust compiler as shipped with Slackware -# should be able to compile the next released version of Rust. -# -# To find the expected date/versions for bootstrap binaries to be able to -# update the urls below, look at src/stage0.txt in the Rust sources. -exit 0 - -# i686 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-i686-unknown-linux-gnu.tar.gz - -# x86_64 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-x86_64-unknown-linux-gnu.tar.gz - diff --git a/testing/source/rust/slack-desc b/testing/source/rust/slack-desc deleted file mode 100644 index 924b1907..00000000 --- a/testing/source/rust/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -rust: rust (a safe, concurrent, practical language) -rust: -rust: Rust is a curly-brace, block-structured expression language. -rust: Its design is oriented toward concerns of "programming in the large", -rust: that is, of creating and maintaining boundaries - both abstract and -rust: operational - that preserve large-system integrity, availability, -rust: and concurrency. -rust: -rust: Homepage: https://rust-lang.org -rust: -rust: |