diff options
Diffstat (limited to 'source/d')
| -rwxr-xr-x | source/d/gcc/gcc.SlackBuild | 4 | ||||
| -rw-r--r-- | source/d/gcc/patches/2701442d0cf6292f6624443c15813d6d1a3562fe.diff | 43 | ||||
| -rw-r--r-- | source/d/gcc/patches/f35d65517a59565758107c5b1a51a5fa382f8d1a.diff | 46 | ||||
| -rw-r--r-- | source/d/gcc/slack-desc.gcc-gnat | 6 | ||||
| -rwxr-xr-x | source/d/libtool/libtool.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/d/python-setuptools/python-setuptools.SlackBuild | 28 | ||||
| -rw-r--r-- | source/d/python-setuptools/setuptools.x86_64.diff | 31 |
7 files changed, 62 insertions, 98 deletions
diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index b639d0cf9..f69d92d00 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -163,10 +163,6 @@ cd gcc-$SRCVER || exit 1 # Smite the fixincludes: zcat $CWD/patches/gcc-no_fixincludes.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -# Fix compile with glibc-2.36: -zcat $CWD/patches/2701442d0cf6292f6624443c15813d6d1a3562fe.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -zcat $CWD/patches/f35d65517a59565758107c5b1a51a5fa382f8d1a.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - # Fix perms/owners: chown -R root:root . find . \ diff --git a/source/d/gcc/patches/2701442d0cf6292f6624443c15813d6d1a3562fe.diff b/source/d/gcc/patches/2701442d0cf6292f6624443c15813d6d1a3562fe.diff deleted file mode 100644 index a39baef4f..000000000 --- a/source/d/gcc/patches/2701442d0cf6292f6624443c15813d6d1a3562fe.diff +++ /dev/null @@ -1,43 +0,0 @@ -From 2701442d0cf6292f6624443c15813d6d1a3562fe Mon Sep 17 00:00:00 2001 -From: Martin Liska <mliska@suse.cz> -Date: Mon, 11 Jul 2022 22:03:14 +0200 -Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream - -9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36 ---- - .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -index 8ed3e92d270..97fd07acf9d 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -73,7 +73,9 @@ - #include <sys/vt.h> - #include <linux/cdrom.h> - #include <linux/fd.h> -+#if SANITIZER_ANDROID - #include <linux/fs.h> -+#endif - #include <linux/hdreg.h> - #include <linux/input.h> - #include <linux/ioctl.h> -@@ -869,10 +871,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; - unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; - #endif -- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; -- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; -- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; -- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; -+ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); -+ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); -+ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); -+ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); - unsigned IOCTL_GIO_CMAP = GIO_CMAP; - unsigned IOCTL_GIO_FONT = GIO_FONT; - unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; --- -2.31.1 - - diff --git a/source/d/gcc/patches/f35d65517a59565758107c5b1a51a5fa382f8d1a.diff b/source/d/gcc/patches/f35d65517a59565758107c5b1a51a5fa382f8d1a.diff deleted file mode 100644 index 61c552e26..000000000 --- a/source/d/gcc/patches/f35d65517a59565758107c5b1a51a5fa382f8d1a.diff +++ /dev/null @@ -1,46 +0,0 @@ -From f35d65517a59565758107c5b1a51a5fa382f8d1a Mon Sep 17 00:00:00 2001 -From: Ian Lance Taylor <iant@golang.org> -Date: Tue, 12 Jul 2022 19:42:43 -0700 -Subject: [PATCH] libgo: don't include <linux/fs.h> when building - gen-sysinfo.go - -Removing this doesn't change anything at least with glibc 2.33. -The include was added in https://go.dev/cl/6100049 but it's not -clear why. - -Fixes PR go/106266 - -Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/417294 ---- - gcc/go/gofrontend/MERGE | 2 +- - libgo/sysinfo.c | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE -index 7c5c45672d7..5ea0406cd8e 100644 ---- a/gcc/go/gofrontend/MERGE -+++ b/gcc/go/gofrontend/MERGE -@@ -1,4 +1,4 @@ --70ca85f08edf63f46c87d540fa99c45e2903edc2 -+ff68b1a147eb60082fd60c198db0ef5477ade938 - - The first line of this file holds the git revision number of the last - merge done from the gofrontend repository. -diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c -index a4259c02ded..fc0210992fa 100644 ---- a/libgo/sysinfo.c -+++ b/libgo/sysinfo.c -@@ -158,9 +158,6 @@ - #if defined(HAVE_LINUX_ETHER_H) - #include <linux/ether.h> - #endif --#if defined(HAVE_LINUX_FS_H) --#include <linux/fs.h> --#endif - #if defined(HAVE_LINUX_REBOOT_H) - #include <linux/reboot.h> - #endif --- -2.31.1 - - diff --git a/source/d/gcc/slack-desc.gcc-gnat b/source/d/gcc/slack-desc.gcc-gnat index 9c1eb7714..8994a0534 100644 --- a/source/d/gcc/slack-desc.gcc-gnat +++ b/source/d/gcc/slack-desc.gcc-gnat @@ -11,9 +11,9 @@ gcc-gnat: gcc-gnat: Ada support for the GNU Compiler Collection. gcc-gnat: gcc-gnat: This package contains those parts of the compiler collection needed to -gcc-gnat: compile Ada code. GNAT implements Ada 95, Ada 2005 and Ada 2012, and -gcc-gnat: it may also be invoked in Ada 83 compatibility mode. By default, GNAT -gcc-gnat: assumes Ada 2012. +gcc-gnat: compile Ada code. GNAT implements Ada 95, Ada 2005, Ada 2012 and Ada +gcc-gnat: 2022, and it may also be invoked in Ada 83 compatibility mode. +gcc-gnat: By default, GNAT assumes Ada 2012. gcc-gnat: gcc-gnat: gcc-gnat: diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild index 451ef718d..7c9ebec7f 100755 --- a/source/d/libtool/libtool.SlackBuild +++ b/source/d/libtool/libtool.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libtool VERSION=${VERSION:-$(echo libtool-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild index 366b4f9c5..694f68ac4 100755 --- a/source/d/python-setuptools/python-setuptools.SlackBuild +++ b/source/d/python-setuptools/python-setuptools.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2013-2014 Audrius Kažukauskas <audrius@neutrino.lt> -# Copyright 2014, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2014, 2017, 2018, 2022 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -47,6 +47,21 @@ if [ -z "$ARCH" ]; then esac fi +if [ "$ARCH" = "i586" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + LIBDIRSUFFIX="" +else + LIBDIRSUFFIX="" +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. @@ -73,6 +88,17 @@ find -L . \ rm -f setuptools/*.exe +# Recent Python versions support both a libdir (for pure Python modules) and a +# platlib (for $ARCH specific modules). We've always patched Python to use +# the platform directory (such as /usr/lib64/python3.9/site-packages on x86_64) +# for all modules. Perhaps we will rethink this, but since an installed +# setuptools now takes priority for reporting the libdir (and this no longer +# matches the platlib on architectures such as x86_64), let's patch setuptools +# to agree with Python: +if [ "$LIBDIRSUFFIX" = "64" ]; then + zcat $CWD/setuptools.x86_64.diff.gz | patch -p1 --verbose || exit 1 +fi + python3 setup.py install --root=$PKG || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/d/python-setuptools/setuptools.x86_64.diff b/source/d/python-setuptools/setuptools.x86_64.diff new file mode 100644 index 000000000..a9731d738 --- /dev/null +++ b/source/d/python-setuptools/setuptools.x86_64.diff @@ -0,0 +1,31 @@ +--- ./setuptools/_distutils/sysconfig.py.orig 2022-08-21 02:05:13.000000000 -0500 ++++ ./setuptools/_distutils/sysconfig.py 2022-08-21 13:33:52.738969315 -0500 +@@ -234,7 +234,7 @@ + libdir = getattr(sys, "platlibdir", "lib") + else: + # Pure Python +- libdir = "lib" ++ libdir = "lib64" + implementation = 'pypy' if IS_PYPY else 'python' + libpython = os.path.join(prefix, libdir, implementation + get_python_version()) + return _posix_lib(standard_lib, libpython, early_prefix, prefix) +--- ./setuptools/_distutils/command/install.py.orig 2022-08-21 13:33:52.738969315 -0500 ++++ ./setuptools/_distutils/command/install.py 2022-08-21 13:35:11.919964935 -0500 +@@ -34,7 +34,7 @@ + + INSTALL_SCHEMES = { + 'posix_prefix': { +- 'purelib': '{base}/lib/{implementation_lower}{py_version_short}/site-packages', ++ 'purelib': '{base}/lib64/{implementation_lower}{py_version_short}/site-packages', + 'platlib': '{platbase}/{platlibdir}/{implementation_lower}' + '{py_version_short}/site-packages', + 'headers': '{base}/include/{implementation_lower}' +@@ -43,7 +43,7 @@ + 'data': '{base}', + }, + 'posix_home': { +- 'purelib': '{base}/lib/{implementation_lower}', ++ 'purelib': '{base}/lib64/{implementation_lower}', + 'platlib': '{base}/{platlibdir}/{implementation_lower}', + 'headers': '{base}/include/{implementation_lower}/{dist_name}', + 'scripts': '{base}/bin', |