Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4868252a38539f417c32958c7c8579cbb0cfede8
commit 4868252a38539f417c32958c7c8579cbb0cfede8 Author: Marius Cirsta <[email protected]> Date: Tue Jun 10 00:26:37 2014 +0300 glibc-2.19-2-x86_64 * drop ports for ARM as they're in mainline now diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index 098bd58..acb4701 100644 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@ -2,16 +2,9 @@ # Maintainer: James Buren <[email protected]> # Contributor: Miklos Vajna <[email protected]> -case "$CARCH" in - 'arm') USE_GLIBC_PORTS_DEFAULT=y;; - *) USE_GLIBC_PORTS_DEFAULT=n;; -esac - -USE_GLIBC_PORTS=${USE_GLIBC_PORTS:-$USE_GLIBC_PORTS_DEFAULT} - pkgname=glibc pkgver=2.19 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library" url="http://www.gnu.org/software/libc/libc.html"; depends=() @@ -26,18 +19,9 @@ _dlurl="http://ftp.gnu.org/pub/gnu/glibc"; source=($_dlurl/glibc-$pkgver.tar.xz) signatures=($_dlurl/glibc-$pkgver.tar.xz.sig) -if Fuse GLIBC_PORTS; then - source=("${source[@]}" "$_dlurl/glibc-ports-$pkgver.tar.xz" \ - glibc-ports-2.15-arm-dep-libmemusage.patch) - signatures=("${signatures[@]}" $_dlurl/glibc-ports-$pkgver.tar.xz.sig '') -fi - build() { Fcd $pkgname-$pkgver - if Fuse GLIBC_PORTS; then - ln -sf $Fsrcdir/glibc-ports-$pkgver ports || Fdie - fi Fpatchall Ffilerel nscd/nscd.conf /etc/nscd.conf ## use Fdie here and kill the build diff --git a/source/base/glibc/glibc-ports-2.15-arm-dep-libmemusage.patch b/source/base/glibc/glibc-ports-2.15-arm-dep-libmemusage.patch deleted file mode 100644 index 2c4452e..0000000 --- a/source/base/glibc/glibc-ports-2.15-arm-dep-libmemusage.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/ports/sysdeps/arm/Makefile b/ports/sysdeps/arm/Makefile ---- a/ports/sysdeps/arm/Makefile 2012-10-07 03:50:53.989001976 -0500 -+++ b/ports/sysdeps/arm/Makefile 2012-10-07 03:51:12.198001304 -0500 -@@ -33,3 +33,8 @@ - ifeq ($(subdir),math) - $(objpfx)libm.so: $(elfobjdir)/ld.so - endif -+ -+# to pull in __aeabi_read_tp, needed for tls -+ifeq ($(subdir),malloc) -+$(objpfx)libmemusage.so: $(common-objpfx)libc_nonshared.a -+endif _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
