From ed2397335fb9130d82674afeb77b7967e50818df Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 10 Sep 2024 19:32:34 +0000 Subject: [PATCH] Tue Sep 10 19:32:34 UTC 2024 l/Imath-3.1.12-x86_64-1.txz: Upgraded. l/gtkmm4-4.16.0-x86_64-1.txz: Upgraded. n/stunnel-5.73-x86_64-1.txz: Upgraded. --- ChangeLog.rss | 17 ++++++- ChangeLog.txt | 5 ++ FILELIST.TXT | 74 ++++++++++++++--------------- source/l/Imath/Imath.SlackBuild | 11 ++--- source/l/gtkmm4/gtkmm4.SlackBuild | 11 ++--- source/n/stunnel/stunnel.SlackBuild | 11 ++--- 6 files changed, 69 insertions(+), 60 deletions(-) diff --git a/ChangeLog.rss b/ChangeLog.rss index 21336ee10..a96d17124 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,22 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Mon, 9 Sep 2024 17:27:00 GMT - Mon, 9 Sep 2024 17:59:39 GMT + Tue, 10 Sep 2024 19:32:34 GMT + Tue, 10 Sep 2024 20:00:16 GMT maintain_current_git.sh v 1.17 + + Tue, 10 Sep 2024 19:32:34 GMT + Tue, 10 Sep 2024 19:32:34 GMT + https://git.slackware.nl/current/tag/?h=20240910193234 + 20240910193234 + + +l/Imath-3.1.12-x86_64-1.txz: Upgraded. +l/gtkmm4-4.16.0-x86_64-1.txz: Upgraded. +n/stunnel-5.73-x86_64-1.txz: Upgraded. + ]]> + + Mon, 9 Sep 2024 17:27:00 GMT Mon, 9 Sep 2024 17:27:00 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 965094784..f65d7a868 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +Tue Sep 10 19:32:34 UTC 2024 +l/Imath-3.1.12-x86_64-1.txz: Upgraded. +l/gtkmm4-4.16.0-x86_64-1.txz: Upgraded. +n/stunnel-5.73-x86_64-1.txz: Upgraded. ++--------------------------+ Mon Sep 9 17:27:00 UTC 2024 ap/stow-2.4.1-x86_64-1.txz: Upgraded. l/cairo-1.18.2-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 838389792..37b04d6b4 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Mon Sep 9 17:31:42 UTC 2024 +Tue Sep 10 19:36:01 UTC 2024 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 2024-09-09 17:27 . +drwxr-xr-x 12 root root 4096 2024-09-10 19:32 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1160757 2024-09-09 00:59 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-09-09 00:59 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1160659 2024-09-09 17:32 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-09-09 17:32 ./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 1173419 2024-09-09 17:27 ./ChangeLog.txt +-rw-r--r-- 1 root root 1173598 2024-09-10 19:32 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2024-09-09 00:52 ./EFI/BOOT -rw-r--r-- 1 root root 1200128 2024-06-23 18:50 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2024-09-09 00:52 ./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 1519039 2024-09-09 00:59 ./FILELIST.TXT +-rw-r--r-- 1 root root 1518924 2024-09-09 17:31 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 916222 2024-09-09 17:31 ./PACKAGES.TXT +-rw-r--r-- 1 root root 916222 2024-09-10 19:35 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 3629 2024-09-09 00:37 ./README.initrd -rw-r--r-- 1 root root 34114 2023-12-11 20:35 ./README_CRYPT.TXT @@ -662,11 +662,11 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches -rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT -drwxr-xr-x 17 root root 4096 2024-09-09 17:31 ./slackware64 --rw-r--r-- 1 root root 357403 2024-09-09 17:31 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-09-09 17:31 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 442551 2024-09-09 17:30 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4766985 2024-09-09 17:30 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2024-09-10 19:35 ./slackware64 +-rw-r--r-- 1 root root 357403 2024-09-10 19:35 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-09-10 19:35 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 442551 2024-09-10 19:34 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4772016 2024-09-10 19:34 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT drwxr-xr-x 2 root root 32768 2024-09-09 00:57 ./slackware64/a -rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt @@ -2786,13 +2786,13 @@ drwxr-xr-x 2 root root 86016 2024-09-02 19:58 ./slackware64/kde -rw-r--r-- 1 root root 517 2024-02-15 21:47 ./slackware64/kde/zanshin-23.08.5-x86_64-1.txt -rw-r--r-- 1 root root 686104 2024-02-15 21:47 ./slackware64/kde/zanshin-23.08.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2024-02-15 21:47 ./slackware64/kde/zanshin-23.08.5-x86_64-1.txz.asc -drwxr-xr-x 2 root root 102400 2024-09-09 17:30 ./slackware64/l +drwxr-xr-x 2 root root 102400 2024-09-10 19:34 ./slackware64/l -rw-r--r-- 1 root root 329 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txt -rw-r--r-- 1 root root 928144 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz -rw-r--r-- 1 root root 163 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz.asc --rw-r--r-- 1 root root 576 2024-02-29 18:06 ./slackware64/l/Imath-3.1.11-x86_64-1.txt --rw-r--r-- 1 root root 112504 2024-02-29 18:06 ./slackware64/l/Imath-3.1.11-x86_64-1.txz --rw-r--r-- 1 root root 163 2024-02-29 18:06 ./slackware64/l/Imath-3.1.11-x86_64-1.txz.asc +-rw-r--r-- 1 root root 576 2024-09-09 22:24 ./slackware64/l/Imath-3.1.12-x86_64-1.txt +-rw-r--r-- 1 root root 103724 2024-09-09 22:24 ./slackware64/l/Imath-3.1.12-x86_64-1.txz +-rw-r--r-- 1 root root 195 2024-09-09 22:24 ./slackware64/l/Imath-3.1.12-x86_64-1.txz.asc -rw-r--r-- 1 root root 551 2024-02-26 18:37 ./slackware64/l/LibRaw-0.21.2-x86_64-2.txt -rw-r--r-- 1 root root 465404 2024-02-26 18:37 ./slackware64/l/LibRaw-0.21.2-x86_64-2.txz -rw-r--r-- 1 root root 163 2024-02-26 18:37 ./slackware64/l/LibRaw-0.21.2-x86_64-2.txz.asc @@ -3156,9 +3156,9 @@ drwxr-xr-x 2 root root 102400 2024-09-09 17:30 ./slackware64/l -rw-r--r-- 1 root root 341 2024-03-21 22:18 ./slackware64/l/gtkmm3-3.24.9-x86_64-1.txt -rw-r--r-- 1 root root 1514540 2024-03-21 22:18 ./slackware64/l/gtkmm3-3.24.9-x86_64-1.txz -rw-r--r-- 1 root root 195 2024-03-21 22:18 ./slackware64/l/gtkmm3-3.24.9-x86_64-1.txz.asc --rw-r--r-- 1 root root 341 2024-03-22 18:11 ./slackware64/l/gtkmm4-4.14.0-x86_64-1.txt --rw-r--r-- 1 root root 1546696 2024-03-22 18:11 ./slackware64/l/gtkmm4-4.14.0-x86_64-1.txz --rw-r--r-- 1 root root 195 2024-03-22 18:11 ./slackware64/l/gtkmm4-4.14.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 341 2024-09-10 17:34 ./slackware64/l/gtkmm4-4.16.0-x86_64-1.txt +-rw-r--r-- 1 root root 1562608 2024-09-10 17:34 ./slackware64/l/gtkmm4-4.16.0-x86_64-1.txz +-rw-r--r-- 1 root root 195 2024-09-10 17:34 ./slackware64/l/gtkmm4-4.16.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 561 2021-02-13 06:49 ./slackware64/l/gtksourceview3-3.24.11-x86_64-4.txt -rw-r--r-- 1 root root 693764 2021-02-13 06:49 ./slackware64/l/gtksourceview3-3.24.11-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 06:49 ./slackware64/l/gtksourceview3-3.24.11-x86_64-4.txz.asc @@ -4121,7 +4121,7 @@ drwxr-xr-x 2 root root 102400 2024-09-09 17:30 ./slackware64/l -rw-r--r-- 1 root root 403 2023-12-11 22:02 ./slackware64/l/zxing-cpp-2.2.1-x86_64-1.txt -rw-r--r-- 1 root root 773596 2023-12-11 22:02 ./slackware64/l/zxing-cpp-2.2.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-12-11 22:02 ./slackware64/l/zxing-cpp-2.2.1-x86_64-1.txz.asc -drwxr-xr-x 2 root root 36864 2024-09-09 17:30 ./slackware64/n +drwxr-xr-x 2 root root 36864 2024-09-10 19:34 ./slackware64/n -rw-r--r-- 1 root root 357 2024-08-21 17:23 ./slackware64/n/ModemManager-1.22.0-x86_64-1.txt -rw-r--r-- 1 root root 1520380 2024-08-21 17:23 ./slackware64/n/ModemManager-1.22.0-x86_64-1.txz -rw-r--r-- 1 root root 195 2024-08-21 17:23 ./slackware64/n/ModemManager-1.22.0-x86_64-1.txz.asc @@ -4540,9 +4540,9 @@ drwxr-xr-x 2 root root 36864 2024-09-09 17:30 ./slackware64/n -rw-r--r-- 1 root root 437 2022-05-27 17:59 ./slackware64/n/sshfs-3.7.3-x86_64-1.txt -rw-r--r-- 1 root root 43944 2022-05-27 17:59 ./slackware64/n/sshfs-3.7.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-05-27 17:59 ./slackware64/n/sshfs-3.7.3-x86_64-1.txz.asc --rw-r--r-- 1 root root 510 2024-02-05 19:26 ./slackware64/n/stunnel-5.72-x86_64-1.txt --rw-r--r-- 1 root root 202616 2024-02-05 19:26 ./slackware64/n/stunnel-5.72-x86_64-1.txz --rw-r--r-- 1 root root 163 2024-02-05 19:26 ./slackware64/n/stunnel-5.72-x86_64-1.txz.asc +-rw-r--r-- 1 root root 510 2024-09-09 22:28 ./slackware64/n/stunnel-5.73-x86_64-1.txt +-rw-r--r-- 1 root root 203268 2024-09-09 22:28 ./slackware64/n/stunnel-5.73-x86_64-1.txz +-rw-r--r-- 1 root root 195 2024-09-09 22:28 ./slackware64/n/stunnel-5.73-x86_64-1.txz.asc -rw-r--r-- 1 root root 2092 2024-08-21 18:09 ./slackware64/n/tagfile -rw-r--r-- 1 root root 648 2023-03-05 21:19 ./slackware64/n/tcp_wrappers-7.6-x86_64-7.txt -rw-r--r-- 1 root root 76756 2023-03-05 21:19 ./slackware64/n/tcp_wrappers-7.6-x86_64-7.txz @@ -5807,11 +5807,11 @@ drwxr-xr-x 2 root root 4096 2024-05-05 18:37 ./slackware64/y -rw-r--r-- 1 root root 1488844 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz -rw-r--r-- 1 root root 195 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2024-09-09 17:31 ./source --rw-r--r-- 1 root root 626698 2024-09-09 17:31 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-09-09 17:31 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 873365 2024-09-09 17:31 ./source/FILE_LIST --rw-r--r-- 1 root root 30254891 2024-09-09 17:31 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2024-09-10 19:36 ./source +-rw-r--r-- 1 root root 626698 2024-09-10 19:36 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-09-10 19:36 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 873365 2024-09-10 19:35 ./source/FILE_LIST +-rw-r--r-- 1 root root 30255108 2024-09-10 19:35 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT drwxr-xr-x 124 root root 4096 2024-08-12 03:46 ./source/a -rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog @@ -10112,9 +10112,9 @@ drwxr-xr-x 2 root root 4096 2016-02-17 23:11 ./source/l/GConf/patches -rw-r--r-- 1 root root 739 2016-02-17 23:10 ./source/l/GConf/patches/0003-gsettings-data-convert-Warn-and-fix-invalid-schema-p.patch.gz -rw-r--r-- 1 root root 10435 2016-02-17 23:10 ./source/l/GConf/patches/0011-Fix-some-compiler-warnings.patch -rw-r--r-- 1 root root 783 2018-02-27 06:12 ./source/l/GConf/slack-desc -drwxr-xr-x 2 root root 4096 2024-02-29 18:06 ./source/l/Imath --rw-r--r-- 1 root root 315176 2024-02-27 01:37 ./source/l/Imath/Imath-3.1.11.tar.lz --rwxr-xr-x 1 root root 3638 2022-05-01 20:28 ./source/l/Imath/Imath.SlackBuild +drwxr-xr-x 2 root root 4096 2024-09-09 22:23 ./source/l/Imath +-rw-r--r-- 1 root root 318446 2024-09-04 22:40 ./source/l/Imath/Imath-3.1.12.tar.lz +-rwxr-xr-x 1 root root 3582 2024-09-09 22:24 ./source/l/Imath/Imath.SlackBuild -rw-r--r-- 1 root root 51 2022-05-01 18:58 ./source/l/Imath/Imath.url -rw-r--r-- 1 root root 1029 2022-05-01 19:02 ./source/l/Imath/slack-desc drwxr-xr-x 2 root root 4096 2023-12-19 20:25 ./source/l/LibRaw @@ -10826,9 +10826,9 @@ drwxr-xr-x 2 root root 4096 2024-03-21 22:17 ./source/l/gtkmm3 -rw-r--r-- 1 root root 15122612 2024-03-17 12:28 ./source/l/gtkmm3/gtkmm-3.24.9.tar.xz -rwxr-xr-x 1 root root 3735 2021-08-15 22:22 ./source/l/gtkmm3/gtkmm3.SlackBuild -rw-r--r-- 1 root root 827 2018-02-27 06:12 ./source/l/gtkmm3/slack-desc -drwxr-xr-x 2 root root 4096 2024-03-22 18:10 ./source/l/gtkmm4 --rw-r--r-- 1 root root 16713784 2024-03-17 11:34 ./source/l/gtkmm4/gtkmm-4.14.0.tar.xz --rwxr-xr-x 1 root root 3735 2024-03-14 04:36 ./source/l/gtkmm4/gtkmm4.SlackBuild +drwxr-xr-x 2 root root 4096 2024-09-10 17:32 ./source/l/gtkmm4 +-rw-r--r-- 1 root root 17108504 2024-09-10 12:55 ./source/l/gtkmm4/gtkmm-4.16.0.tar.xz +-rwxr-xr-x 1 root root 3679 2024-09-10 17:32 ./source/l/gtkmm4/gtkmm4.SlackBuild -rw-r--r-- 1 root root 827 2024-03-21 19:33 ./source/l/gtkmm4/slack-desc drwxr-xr-x 2 root root 4096 2022-09-06 18:27 ./source/l/gtksourceview3 -rw-r--r-- 1 root root 1438232 2019-05-05 23:22 ./source/l/gtksourceview3/gtksourceview-3.24.11.tar.xz @@ -13612,12 +13612,12 @@ drwxr-xr-x 2 root root 4096 2022-05-27 17:59 ./source/n/sshfs -rw-r--r-- 1 root root 53596 2022-05-26 13:27 ./source/n/sshfs/sshfs-3.7.3.tar.xz -rw-r--r-- 1 root root 1012 2022-05-26 13:27 ./source/n/sshfs/sshfs-3.7.3.tar.xz.asc -rwxr-xr-x 1 root root 4227 2021-06-08 20:28 ./source/n/sshfs/sshfs.SlackBuild -drwxr-xr-x 2 root root 4096 2024-02-05 19:26 ./source/n/stunnel +drwxr-xr-x 2 root root 4096 2024-09-09 22:27 ./source/n/stunnel -rw-r--r-- 1 root root 268 2015-09-17 19:39 ./source/n/stunnel/doinst.sh.gz -rw-r--r-- 1 root root 286 2016-08-22 18:28 ./source/n/stunnel/generate-stunnel-key.sh -rw-r--r-- 1 root root 965 2018-02-27 06:13 ./source/n/stunnel/slack-desc --rw-r--r-- 1 root root 634119 2024-02-05 08:09 ./source/n/stunnel/stunnel-5.72.tar.lz --rwxr-xr-x 1 root root 4728 2023-07-13 19:15 ./source/n/stunnel/stunnel.SlackBuild +-rw-r--r-- 1 root root 637329 2024-09-09 16:13 ./source/n/stunnel/stunnel-5.73.tar.lz +-rwxr-xr-x 1 root root 4696 2024-09-09 22:27 ./source/n/stunnel/stunnel.SlackBuild -rw-r--r-- 1 root root 39 2018-05-22 17:22 ./source/n/stunnel/stunnel.url drwxr-xr-x 2 root root 4096 2023-03-05 20:50 ./source/n/tcp_wrappers -rw-r--r-- 1 root root 1108 2018-02-27 06:13 ./source/n/tcp_wrappers/slack-desc diff --git a/source/l/Imath/Imath.SlackBuild b/source/l/Imath/Imath.SlackBuild index 9e7657210..2fbf6e962 100755 --- a/source/l/Imath/Imath.SlackBuild +++ b/source/l/Imath/Imath.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -52,14 +52,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/gtkmm4/gtkmm4.SlackBuild b/source/l/gtkmm4/gtkmm4.SlackBuild index 2e5060740..258428ae4 100755 --- a/source/l/gtkmm4/gtkmm4.SlackBuild +++ b/source/l/gtkmm4/gtkmm4.SlackBuild @@ -31,7 +31,7 @@ SRCNAM=gtkmm if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -50,14 +50,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/n/stunnel/stunnel.SlackBuild b/source/n/stunnel/stunnel.SlackBuild index 7cf1f878e..b90523df5 100755 --- a/source/n/stunnel/stunnel.SlackBuild +++ b/source/n/stunnel/stunnel.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -46,14 +46,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2"