From 29f41a7e532ec0c09d93da36669218d1faaff86c Mon Sep 17 00:00:00 2001 From: EnumDev Date: Mon, 27 Oct 2025 14:48:18 +0200 Subject: [PATCH] Switch to new download format --- pkg.info | 25 +++++++++++++++++++------ source.sh | 18 +++++++----------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/pkg.info b/pkg.info index 291c2b3..0183867 100644 --- a/pkg.info +++ b/pkg.info @@ -1,12 +1,25 @@ name: glibc description: The GNU C Library -version: 2.42 +version: "2.42" +revision: 2 url: https://www.gnu.org/software/libc/ license: GPL2-or-later,LGPL2.1-or-later,BSD-3-Clause architecture: any -depends: ["tzdata"] -optional_depends: ["gd","perl"] -make_depends: ["gd","python3"] -provides: ["libc"] -keep: ["etc/locale.gen"] type: source +keep: + - etc/locale.gen +depends: + - tzdata +optional_depends: + - gd + - perl +make_depends: + - gd + - python3 +provides: + - libc +downloads: + - url: https://ftpmirror.gnu.org/gnu/glibc/glibc-${BPM_PKG_VERSION}.tar.xz + extract_to: ${BPM_SOURCE} + extract_strip_components: 1 + checksum: d1775e32e4628e64ef930f435b67bb63af7599acb6be2b335b9f19f16509f17f diff --git a/source.sh b/source.sh index e30372a..0490e57 100644 --- a/source.sh +++ b/source.sh @@ -2,16 +2,6 @@ # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT -DOWNLOAD="https://ftpmirror.gnu.org/gnu/glibc/glibc-${BPM_PKG_VERSION}.tar.xz" -FILENAME="${DOWNLOAD##*/}" - -# The prepare function is executed in the root of the temp directory -# This function is used for downloading files and putting them into the correct location -prepare() { - wget "$DOWNLOAD" - tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE" -} - # The build function is executed in the source directory # This function is used to compile the source code build() { @@ -48,10 +38,16 @@ check() { # disable tests that take too long on most systems sed -i "/tst-thread-affinity-pthread/d" nptl/Makefile sed -i "/tst-thread-affinity-sched/d" nptl/Makefile + sed -i '/tst-resolv-res_init-multi/d' resolv/Makefile cd build - make check + # adjust/remove buildflags that cause false-positive testsuite failures + sed -i 's/-Werror=format-security/-Wformat-security/' config.make # failure to build testsuite + sed -i '/CFLAGS/s/-fno-plt//' config.make # 27 failures + sed -i '/CFLAGS/s/-fexceptions//' config.make # 1 failure + + make check } # The package function is executed in the source directory