diff options
author | Christer Solskogen | 2023-01-07 12:36:25 +0000 |
---|---|---|
committer | Christer Solskogen | 2023-01-07 12:36:25 +0000 |
commit | 7bd653d36624d152b2d394bfc8365c8d58f8b813 (patch) | |
tree | 24c2ede4f55dffc4c180dfb4fab3c46a7d99f115 | |
parent | 175c84a4790a31f4f2feb81ea8922d1c9df17728 (diff) | |
download | aur-7bd653d36624d152b2d394bfc8365c8d58f8b813.tar.gz |
switch to using git and align with ALARM
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 46 |
2 files changed, 27 insertions, 31 deletions
@@ -1,22 +1,20 @@ pkgbase = armv7l-glibc - pkgdesc = GNU C Library ARM (32bit) target + pkgdesc = GNU C Library ARM64 target pkgver = 2.36 pkgrel = 3 url = https://www.gnu.org/software/libc/ arch = any license = GPL license = LGPL - makedepends = armv7l-binutils + makedepends = git makedepends = armv7l-gcc + makedepends = armv7l-linux-api-headers makedepends = python - depends = armv7l-linux-api-headers options = !strip options = staticlibs - source = https://ftp.gnu.org/gnu/libc/glibc-2.36.tar.xz - source = https://ftp.gnu.org/gnu/libc/glibc-2.36.tar.xz.sig + source = git+https://sourceware.org/git/glibc.git#commit=4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c validpgpkeys = 7273542B39962DF7B299931416792B4EA25340F8 validpgpkeys = BC7C7372637EC10C57D7AA6579C43DFBF1CF2187 - sha256sums = 1c959fea240906226062cb4b1e7ebce71a9f0e3c0836c09e7e3423d434fcfe75 - sha256sums = SKIP + b2sums = SKIP pkgname = armv7l-glibc @@ -1,61 +1,60 @@ # Maintainer: Christer Solskogen <christer.solskogen@gmail.com> # Build order: armv7l-binutils -> armv7l-linux-api-headers -> armv7l-gcc-bootstrap -> armv7l-glibc -> armv7l-gcc -> armv7l-glibc (again) - _arch=armv7l _target=$_arch-unknown-linux-gnueabihf pkgname=$_arch-glibc pkgver=2.36 pkgrel=3 -_commit=be176490b818b65b5162c332eb6b581690b16e5c -pkgdesc="GNU C Library ARM (32bit) target" +_commit=4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c +pkgdesc="GNU C Library ARM64 target" arch=(any) url='https://www.gnu.org/software/libc/' license=('GPL' 'LGPL') -depends=($_arch-linux-api-headers) -makedepends=($_arch-binutils $_arch-gcc python) +depends=() +makedepends=(git $_arch-gcc $_arch-linux-api-headers python) options=(!strip staticlibs) -source=(https://ftp.gnu.org/gnu/libc/glibc-$pkgver.tar.xz{,.sig}) -sha256sums=('1c959fea240906226062cb4b1e7ebce71a9f0e3c0836c09e7e3423d434fcfe75' - 'SKIP') +source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}) + validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # "Carlos O'Donell <carlos@systemhalted.org>" BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar +b2sums=('SKIP') -build() { +prepare() { mkdir -p glibc-build - cd glibc-build +} +build() { + cd glibc-build echo "build-programs=no" > configparms echo "cross-compiling=yes" >> configparms echo "slibdir=/usr/lib" >> configparms echo "rtlddir=/usr/lib" >> configparms - - #Use c/cxx-flags from Arch Linux ARM - CFLAGS="-march=armv7-a -mfloat-abi=hard -mfpu=neon -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions \ +#Use CFLAGS/CXXFLAGS from Arch Linux ARM +CFLAGS="-march=armv7-a -mfloat-abi=hard -mfpu=neon -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions \ -Wformat -Werror=format-security \ -fstack-clash-protection" +CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" - "$srcdir"/glibc-$pkgver/configure \ + ../glibc/configure \ --prefix=/usr \ --host=$_target \ --libdir=/usr/lib \ - --with-bugurl=https://aur.archlinux.org/packages/armv7l-glibc \ - --enable-add-ons \ + --with-bugurl=https://aur.archlinux.org/packages/aarch64-glibc \ + --enable-kernel=5.10 \ --enable-bind-now \ - --enable-lock-elision \ --disable-multi-arch \ --enable-stack-protector=strong \ - --enable-stackguard-randomization \ --disable-profile \ - --disable-timezone-tools \ - --disable-werror + --disable-werror \ + --disable-timezone-tools - make --jobserver-style=pipe + make } package() { cd glibc-build - make --jobserver-style=pipe DESTDIR="$pkgdir"/usr/$_target/sys-root install + make DESTDIR="$pkgdir"/usr/$_target/sys-root install #we don't want static libraries. Only keep the one that we really need. find "$pkgdir"/usr/$_target/sys-root -name '*.a' -and -not -name libc_nonshared.a -delete @@ -66,7 +65,6 @@ package() { #strip manually find "$pkgdir"/usr/$_target/sys-root -name '*.so' -and ! -name 'libc.so' -print0 | xargs -0 $_target-strip --strip-all - #fix missing symlink + #create symlink to the shared library since we don't have the static one (gcc needs this) ln -s libpthread.so.0 "$pkgdir"/usr/$_target/sys-root/usr/lib/libpthread.so - } |