Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/binutils/PKGBUILD2
-rw-r--r--core/coreutils/PKGBUILD5
-rw-r--r--core/coreutils/coreutils-8.30-uname-i486.patch12
-rw-r--r--core/coreutils/coreutils-9.5-uname-i486.patch12
-rw-r--r--core/curl/PKGBUILD10
-rw-r--r--core/dbus/PKGBUILD11
-rw-r--r--core/filesystem/PKGBUILD2
-rw-r--r--core/glibc/PKGBUILD20
-rw-r--r--core/libtool/PKGBUILD3
-rw-r--r--core/openssl/PKGBUILD4
-rw-r--r--core/pacman/PKGBUILD28
-rw-r--r--core/pacman/makepkg.conf17
-rw-r--r--core/syslinux/PKGBUILD15
-rw-r--r--core/syslinux/syslinux-strip-gnu-property.patch18
14 files changed, 70 insertions, 89 deletions
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index f4694854..627e520a 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -49,7 +49,7 @@ if [ "${CARCH}" = "i486" ]; then
eval "$(
declare -f build | \
sed '
- s/--enable-pgo-build=.*/--disable-pgo-build/
+ s/--enable-pgo-build=lto/--disable-pgo-build/
s/--enable-lto/--disable-lto/
s/--enable-gold/--disable-gold/
'
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index f4b69568..5385a852 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -1,8 +1,8 @@
# 486-specific
if [ "${CARCH}" = "i486" ]; then
# make uname return i486 instead of i686 when used with setarch
- source+=('coreutils-8.30-uname-i486.patch')
- sha256sums+=('4e3971d7c5f6363d2d2ceeea23958ec6db1d6e5d2c7fc20bc5d6d6bfa7290ad0')
+ source+=('coreutils-9.5-uname-i486.patch')
+ sha256sums+=('9c8b9c88a2f737808ef43dca4c7ea03c638930e33f3c01e7c407ec6f9f67f218')
fi
# FS#66506: temporarily ignore test-login failure
@@ -12,3 +12,4 @@ eval "$(
s/make check/make check || true/
'
)"
+
diff --git a/core/coreutils/coreutils-8.30-uname-i486.patch b/core/coreutils/coreutils-8.30-uname-i486.patch
deleted file mode 100644
index f7872693..00000000
--- a/core/coreutils/coreutils-8.30-uname-i486.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rauN coreutils-8.30/src/uname.c coreutils-8.30-uname-patch-i486/src/uname.c
---- coreutils-8.30/src/uname.c 2018-05-14 06:20:24.000000000 +0200
-+++ coreutils-8.30-uname-patch-i486/src/uname.c 2019-01-28 21:12:09.151041534 +0100
-@@ -285,6 +285,8 @@
-
- if (uname (&name) == -1)
- die (EXIT_FAILURE, errno, _("cannot get system name"));
-+
-+ strcpy(name.machine, "i486");
-
- if (toprint & PRINT_KERNEL_NAME)
- print_element (name.sysname);
diff --git a/core/coreutils/coreutils-9.5-uname-i486.patch b/core/coreutils/coreutils-9.5-uname-i486.patch
new file mode 100644
index 00000000..7250be30
--- /dev/null
+++ b/core/coreutils/coreutils-9.5-uname-i486.patch
@@ -0,0 +1,12 @@
+diff -rauN coreutils-9.5/src/uname.c coreutils-9.5-uname-i486-patch/src/uname.c
+--- coreutils-9.5/src/uname.c 2024-01-01 14:27:23.000000000 +0100
++++ coreutils-9.5-uname-i486-patch/src/uname.c 2024-04-26 08:25:24.914671684 +0200
+@@ -298,6 +298,8 @@
+
+ if (uname (&name) == -1)
+ error (EXIT_FAILURE, errno, _("cannot get system name"));
++
++ strcpy(name.machine, "i486");
+
+ if (toprint & PRINT_KERNEL_NAME)
+ print_element_env (name.sysname, "UNAME_SYSNAME");
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index eaaffe13..6d7d6522 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,7 +1,3 @@
-# disable QUIC for now (we have and old openssl library in staging?!)
-eval "$(
- declare -f build | \
- sed '
- /configure/s/--with-openssl-quic//g
- '
-)"
+# Valgrind seems broken for now
+unset check
+unset checkdepends
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
new file mode 100644
index 00000000..4123575d
--- /dev/null
+++ b/core/dbus/PKGBUILD
@@ -0,0 +1,11 @@
+# Disable documentation on i486, it just fails everywhere
+if [ "${CARCH}" = "i486" ]; then
+ eval "$(
+ declare -f build | \
+ sed '
+ s/--enable-xml-docs/--disable-xml-docs/
+ s/--enable-doxygen-docs/--disable-doxygen-docs/
+ s/--enable-ducktype-docs/--disable-ducktype-docs/
+ '
+ )"
+fi
diff --git a/core/filesystem/PKGBUILD b/core/filesystem/PKGBUILD
index 1190f08c..dca46aa8 100644
--- a/core/filesystem/PKGBUILD
+++ b/core/filesystem/PKGBUILD
@@ -4,7 +4,7 @@
# change checksum of adapted os-release
for i in "${!sha256sums[@]}" ${#sha256sums[@]}; do
- if [ "${sha256sums["${i}"]}" = '46108f7e84f5d5994678133d412d5ec6222c53f28e6bf7ac66cc07788a7ee66d' ]; then
+ if [ "${sha256sums["${i}"]}" = '71ff7a6e248d9a0718344c957ec709cb6f0b18631682fa404d7cff2af3ff341d' ]; then
break
fi
done
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index eb3971c3..c8cb5e40 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -30,16 +30,16 @@ eval "$(
makedepends=(${makedepends[@]//gd/})
makedepends_i686+=('gd')
-if [ "${CARCH}" = "i486" ]; then
-
- # disable testing for now, we run out of memory
- eval "$(
- declare -f check | \
- sed '
- /make -O check/d
- '
- )"
-fi
+# patching fails, tests are disabled lower anyway completely
+#if [ "${CARCH}" = "i486" ]; then
+# # disable testing for now, we run out of memory
+# eval "$(
+# declare -f check | \
+# sed '
+# /make -O check/d
+# '
+# )"
+#fi
# pentium4 specific
diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD
deleted file mode 100644
index eb241c98..00000000
--- a/core/libtool/PKGBUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-# temporary fix for FS#65995
-source[3]='https://sources.debian.org/data/main/libt/libtool/2.4.6-14/debian/patches/no_hostname.patch'
-sha256sums[3]='693aabb24a6e7ce21fe0b5d14394e19edcb8476663b5afa4463f9fa0df24d946'
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 03c17f77..0de77e9c 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -13,7 +13,8 @@ if [ "${CARCH}" = "i486" ]; then
eval "$(
declare -f build | \
sed '
- s@enable-ktls@enable-ktls 386 no-threads@
+ s@enable-ktls@enable-ktls 386@
+ s@make@make LDFLAGS='-latomic@'
'
)"
fi
@@ -35,3 +36,4 @@ eval "$(
s/make.*test/make test || true/
'
)"
+
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index b8f350ea..e5966c06 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -4,8 +4,8 @@ depends+=(archlinux32-keyring)
# fail if upstream changes makepkg.conf or pacman.conf
for ((i=0; i<${#sha256sums[@]}; i++)); do
- if [ "${sha256sums[${i}]}" = 'f2791b51588104ec6dbaafa389451056f3c61fa6c19510dcce3a9a6cc19cba29' ]; then
- sha256sums[${i}]='d7e2516889c62cd3d0c1f2af5199fe0564c5ef35900d6b6551a8c9ce1c80f95a'
+ if [ "${sha256sums[${i}]}" = '2465d495cb275dce434eb3bfe4d293a223e301b968c14861aea42bc7c60404ef' ]; then
+ sha256sums[${i}]='82e963060a02c9a04cf5296bb4c5e732d3c3d0666d221ddaf2b3367989b9d894'
fi
if [ "${sha256sums[${i}]}" = '656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a' ]; then
sha256sums[${i}]='663cbfe0643ff78c1eeb38d59046707da49bde6ab8226fbc5844457a985cb5bc'
@@ -28,7 +28,7 @@ source+=('replace-i686-by-pentium4-when-architecture-is-auto.patch')
sha256sums+=('6a7906bd28a57cbcff58d856ffefbbb9096a163aaff79913b4fac69d75d0028a')
# not supported on i486 -fcf-protection
-# LTO currently no availavle on i486
+# LTO currently no available on i486
if [ "${CARCH}" = "i486" ]; then
eval "$(
{
@@ -42,20 +42,20 @@ if [ "${CARCH}" = "i486" ]; then
)"
fi
+# If this still applies, it only does for i486:
+if [ "${CARCH}" = "i486" ]; then
# broken Python/asciidoc
-eval "$(
- declare -f build | \
- sed '
- /meson/s/-Ddoc=enabled/-Ddoc=disabled/
- '
-)"
-
-# overload wrong checksums
-sha256sums[11]='468837eed9a4ffd3778f159a7e62f89a38a4244f822a3a5b014daa69e3c65d28'
-sha256sums[13]='d08d4a56dc3a977fdfd4591c30733fa28976710ffba53786541d98717892dc24'
-sha256sums[14]='4a3cdfba490121a20f3648791cd47ba323f3d3d56bf7ced21b9badb1f22d6abc'
+ eval "$(
+ declare -f build | \
+ sed '
+ /meson/s/-Ddoc=enabled/-Ddoc=disabled/
+ '
+ )"
+fi
# gettext is linked against old ICU verison on i486, use ICU 72 stub
if [ "${CARCH}" = "i486" ]; then
makedepends+=(icu72)
fi
+
+sha256sums[0]='SKIP'
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index d333a442..69c05355 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -41,12 +41,14 @@ CHOST="i686-pc-linux-gnu"
#-- Compiler and Linker Flags
#CPPFLAGS=""
CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
- -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
- -fstack-clash-protection -fcf-protection"
+ -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
+ -fstack-clash-protection -fcf-protection \
+ -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
+ -Wl,-z,pack-relative-relocs"
LTOFLAGS="-flto=auto"
-RUSTFLAGS=""
+RUSTFLAGS="-Cforce-frame-pointers=yes"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
#-- Debugging flags
@@ -81,7 +83,7 @@ BUILDENV=(!distcc color !ccache check !sign)
# These are default values for the options=() settings
#########################################################################
#
-# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
+# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps)
# A negated option will do the opposite of the comments below.
#
#-- strip: Strip symbols from binaries/libraries
@@ -93,8 +95,9 @@ BUILDENV=(!distcc color !ccache check !sign)
#-- purge: Remove files specified by PURGE_TARGETS
#-- debug: Add debugging flags as specified in DEBUG_* variables
#-- lto: Add compile flags for building with link time optimization
+#-- autodeps: Automatically add depends/provides
#
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug !lto)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto)
#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
INTEGRITY_CHECK=(sha256)
@@ -112,6 +115,8 @@ DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
#-- Directory to store source code in for debug packages
DBGSRCDIR="/usr/src/debug"
+#-- Prefix and directories for library autodeps
+LIB_DIRS=('lib:usr/lib')
#########################################################################
# PACKAGE OUTPUT
diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD
index 253c1507..d88b9185 100644
--- a/core/syslinux/PKGBUILD
+++ b/core/syslinux/PKGBUILD
@@ -2,7 +2,7 @@
# to minor and major
source+=(syslinux-sysmacros.patch)
-sha1sums+=('52c5233da147acd41d542b1673835be966b561e3')
+sha256sums+=('0bc539928c3c044f2f01532b126a33dcb90c689ea698c7669e013ca97f71a4d2')
eval "$(
declare -f prepare | \
@@ -11,18 +11,5 @@ eval "$(
'
)"
-# binutils adds a nore.gnu.proprerty ELF section, this makes the MBR slightly
-# too big to fit on disk (see also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906414)
-
-source+=(syslinux-strip-gnu-property.patch)
-sha1sums+=('fb8e96b559516038e628ad55e0331e4c668205a8')
-
-eval "$(
- declare -f prepare | \
- sed '
- /patch.*efi_no_kbd/a patch -p1 < ../syslinux-strip-gnu-property.patch
- '
-)"
-
# don't build efi64
_targets='bios efi32'
diff --git a/core/syslinux/syslinux-strip-gnu-property.patch b/core/syslinux/syslinux-strip-gnu-property.patch
deleted file mode 100644
index 363a1ee2..00000000
--- a/core/syslinux/syslinux-strip-gnu-property.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -rauN syslinux/mbr/i386/mbr.ld syslinux-strip-gnu-property-patch/mbr/i386/mbr.ld
---- syslinux/mbr/i386/mbr.ld 2018-10-14 13:54:59.532050409 +0200
-+++ syslinux-strip-gnu-property-patch/mbr/i386/mbr.ld 2018-10-14 14:06:48.788976484 +0200
-@@ -70,4 +70,5 @@
- .debug_typenames 0 : { *(.debug_typenames) }
- .debug_varnames 0 : { *(.debug_varnames) }
- /DISCARD/ : { *(.note.GNU-stack) }
-+ /DISCARD/ : { *(.note.gnu.property) }
- }
-diff -rauN syslinux/mbr/x86_64/mbr.ld syslinux-strip-gnu-property-patch/mbr/x86_64/mbr.ld
---- syslinux/mbr/x86_64/mbr.ld 2018-10-14 13:54:59.533050375 +0200
-+++ syslinux-strip-gnu-property-patch/mbr/x86_64/mbr.ld 2018-10-14 14:06:40.133269711 +0200
-@@ -69,4 +69,5 @@
- .debug_typenames 0 : { *(.debug_typenames) }
- .debug_varnames 0 : { *(.debug_varnames) }
- /DISCARD/ : { *(.note.GNU-stack) }
-+ /DISCARD/ : { *(.note.gnu.property) }
- }

Copyright © 2002-2022 Judd Vinet and Aaron Griffin. Copyright © 2022 Erich Eckner.
The Arch Linux name and logo are recognized trademarks. Some rights reserved. The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.