diff options
| author | Tim Biermann <tbier@posteo.de> | 2022-01-07 18:37:13 +0100 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2022-01-07 18:37:13 +0100 |
| commit | 080bf5002954bafa838ba8f5a5b4fc1568c9b631 (patch) | |
| tree | 691443a0e16141242e6d236c551cb95160529266 /glibc-32 | |
| parent | 39270dd147fc6b4f529e9549ac12dffb4aee2e1d (diff) | |
| parent | 30c3943f7ff48a5fe9a6467cbd8164dd096df492 (diff) | |
| download | core-080bf5002954bafa838ba8f5a5b4fc1568c9b631.tar.gz core-080bf5002954bafa838ba8f5a5b4fc1568c9b631.tar.xz | |
Merge branch '3.7-alpha0' into 3.7
Diffstat (limited to 'glibc-32')
| -rw-r--r-- | glibc-32/.footprint | 2 | ||||
| -rw-r--r-- | glibc-32/.signature | 6 | ||||
| -rw-r--r-- | glibc-32/Pkgfile | 20 |
3 files changed, 17 insertions, 11 deletions
diff --git a/glibc-32/.footprint b/glibc-32/.footprint index 92b0e1b6..88c87295 100644 --- a/glibc-32/.footprint +++ b/glibc-32/.footprint @@ -303,6 +303,7 @@ drwxr-xr-x root/root usr/lib32/getconf/ -rwxr-xr-x root/root usr/lib32/getconf/POSIX_V7_ILP32_OFFBIG -rwxr-xr-x root/root usr/lib32/getconf/XBS5_ILP32_OFF32 -rwxr-xr-x root/root usr/lib32/getconf/XBS5_ILP32_OFFBIG +-rw-r--r-- root/root usr/lib32/grcrt1.o -rw-r--r-- root/root usr/lib32/libBrokenLocale.a lrwxrwxrwx root/root usr/lib32/libBrokenLocale.so -> ../../lib32/libBrokenLocale.so.1 -rw-r--r-- root/root usr/lib32/libanl.a @@ -327,3 +328,4 @@ lrwxrwxrwx root/root usr/lib32/libresolv.so -> ../../lib32/libresolv.so.2 -rw-r--r-- root/root usr/lib32/librt.a lrwxrwxrwx root/root usr/lib32/libthread_db.so -> ../../lib32/libthread_db.so.1 -rw-r--r-- root/root usr/lib32/libutil.a +-rw-r--r-- root/root usr/lib32/rcrt1.o diff --git a/glibc-32/.signature b/glibc-32/.signature index 1bf25a3a..5dcca12b 100644 --- a/glibc-32/.signature +++ b/glibc-32/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqpa8Cr4ATxBe5I7WyhDcSv8erM6ralqDcoKb5x56uQ2MlsUZcKgHzQZZvmRg0sDU3pw63eeHEJmXQYsSelUZZA4= -SHA256 (Pkgfile) = 7a91d36f12fcb98b523d0af2898fe75f1e0704e8b83dd32f4415ee1fa8ff143b -SHA256 (.footprint) = 28c0be81580495d8789fce4c11a415bd557693f979c5beb40977cbac1607853b +RWRJc1FUaeVeqjMglBs29r0xnkWCM0kkBzI2ipNRYJiVx7kAKgjUOTi7W7bcnMDbNDPmm2007uR8Ap9ycVgMVNkdPHDQjMHoYwM= +SHA256 (Pkgfile) = 1aa584a9e2fb75c2e2b1591e6bc8711ff723e7a62d5956bf05215e5720cd7cf3 +SHA256 (.footprint) = 54c55f2d06c68fe3fb88ea56cdcf13038a41794a90855c8c17e4112d8eb7cbdc SHA256 (glibc-2.34.tar.xz) = 44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2 SHA256 (linux-5.15.11.tar.xz) = c1178b7e7e12d91292e670191268e3fe9a3563faf899eef43e468577e973a1ce SHA256 (glibc-2.34-1.patch) = 38455bc201d53743b34335464a10d8ab2bfc456e71c49c116a58397ca48c7e2a diff --git a/glibc-32/Pkgfile b/glibc-32/Pkgfile index 909dcbeb..8df32af0 100644 --- a/glibc-32/Pkgfile +++ b/glibc-32/Pkgfile @@ -5,16 +5,17 @@ name=glibc-32 version=2.34 release=1 -source=(https://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \ - https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.11.tar.xz \ +_kernel_version=5.15.11 + +source=(https://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz + https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_kernel_version.tar.xz glibc-$version-1.patch lib32.conf) build() { # install kernel headers - cd linux-5.15.11 - make mrproper - make headers_check - make INSTALL_HDR_PATH=$PKG/usr headers_install + make -C $SRC/linux-$_kernel_version mrproper + make -C $SRC/linux-$_kernel_version headers_check + make -C $SRC/linux-$_kernel_version INSTALL_HDR_PATH=$PKG/usr headers_install chown root:root $PKG/usr patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-$version-1.patch @@ -32,14 +33,17 @@ build() { --with-headers=$PKG/usr/include \ --enable-kernel=4.9 \ --enable-add-ons \ + --enable-stack-protector=strong \ + --enable-static-pie \ + --enable-bind-now \ + --enable-multi-arch \ --disable-profile \ --disable-werror \ --without-gd \ - --enable-stack-protector=strong \ --enable-multi-arch \ i686-pc-linux-gnu - make + make #make check make install_root=$PKG install |