Date: Friday, May 13, 2022 @ 14:56:26 Author: freswa Revision: 445400
move from build a tarball to building from git While building the tarball makes it more transparant to apply patches since they must be listed in the PKGBUILD, this approach misses a lot of code that landed in the upstream stable branch intentionally. Also it gives room for discussions what patches to apply and when they're ready to be used. This avoids confusion by setting the upstream merge of any patch as the requirement to be applied. ymmv Modified: glibc/trunk/PKGBUILD ----------+ PKGBUILD | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-05-13 14:48:33 UTC (rev 445399) +++ PKGBUILD 2022-05-13 14:56:26 UTC (rev 445400) @@ -9,6 +9,7 @@ pkgbase=glibc pkgname=(glibc lib32-glibc) pkgver=2.35 +_commit=28ea43f8d64f0dd1f2de75525157730e1532e600 pkgrel=4 arch=(x86_64) url='https://www.gnu.org/software/libc' @@ -15,36 +16,27 @@ license=(GPL LGPL) makedepends=(git gd lib32-gcc-libs python) options=(!strip staticlibs !lto) -#_commit=3de512be7ea6053255afed6154db9ee31d4e557a -#source=(git+https://sourceware.org/git/glibc.git#commit=$_commit -source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig} +source=(git+https://sourceware.org/git/glibc.git#commit=${_commit} locale.gen.txt locale-gen lib32-glibc.conf sdt.h sdt-config.h disable-clone3.diff - 0001-localedef-Update-LC_MONETARY-handling-Bug-28845.patch - 0001-localedata-Do-not-generate-output-if-warnings-were-p.patch - 0001-elf-Fix-DFS-sorting-algorithm-for-LD_TRACE_LOADED_OB.patch ) validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar -b2sums=('623c728884f070cd87ffeb9203f74206197c52405ac9bc44f3dd519a3468b8e8ae2536c883e5d17d94417dbd1e91775de2e674314e4ff7424f9720026d6b7063' - 'SKIP' +b2sums=('SKIP' '46d533d25c7a2ce4ae75d452eee7ebb8e3ce4d191af9be3daa43718b78cb81d33cfd8046a117a15d87de9f5e940448c66005b0490515bf731c9e4691c53908d6' '1f6d927b4972220b1c00abee5329c5d6bc01ed5bee57b20db0c7d7433292f7d666b02baf9968267f8e378b1f3bb273e8eef0ccbf22d21400ac36949d7615a474' '7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a' 'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e' '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678' - 'edef5f724f68ea95c6b0127bd13a10245f548afc381b2d0a6d1d06ee9f87b7dd89c6becd35d5ae722bf838594eb870a747f67f07f46e7d63f8c8d1a43cce4a52' - '3c4de02d6308a4d39693e6effa08894ae096397347e439b93b0b5328aba41a373f7f2eeb88c109970f69cca65aaa74ba14e384d6d033f6a913438f4f920854a6' - 'b6014af23688ea971d7af38d58829c8016a0af63770b7f5e8bc986c13ea2cafefe0935ff483b1b37c87ebe3e652b6e0c48ab43dd8ae752d0ed7fecc3751432f4' - 'd77c8f9c807f25aeeafa302858116f4adf903f46fe1db2035dbe998105d7206bbc6d3055119831ff7744eb721b05795866c80d99671c3a8f33d5386d80978248') + 'edef5f724f68ea95c6b0127bd13a10245f548afc381b2d0a6d1d06ee9f87b7dd89c6becd35d5ae722bf838594eb870a747f67f07f46e7d63f8c8d1a43cce4a52') prepare() { mkdir -p glibc-build lib32-glibc-build - [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc + [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc cd glibc # Disable clone3 syscall for now @@ -52,15 +44,6 @@ # https://github.com/electron/electron/commit/993ecb5bdd5c57024c8718ca6203a8f924d6d574 # Patch src: https://patchwork.ozlabs.org/project/glibc/patch/[email protected]/ patch -Np1 -i "${srcdir}"/disable-clone3.diff - - # Fix C.UTF-8 generation errors - # https://bugs.archlinux.org/task/73797 - patch -Np1 -i "${srcdir}"/0001-localedef-Update-LC_MONETARY-handling-Bug-28845.patch - patch -Np1 -i "${srcdir}"/0001-localedata-Do-not-generate-output-if-warnings-were-p.patch - - # Fix Sefault introduced by new DFS algorithm - # https://bugs.archlinux.org/task/73938 - patch -Np1 -i "${srcdir}"/0001-elf-Fix-DFS-sorting-algorithm-for-LD_TRACE_LOADED_OB.patch } build() {
