From ef84f3049c1ca7b845cf99c03ebf0dfe73c25d6a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 8 May 2010 17:47:50 +0200 Subject: [PATCH] glibc: added patch to workaround an assertion in getpagesize() on static bins. --- srcpkgs/glibc/glibc-devel.template | 2 ++ .../getpagesize_workaround_assertion.patch | 21 +++++++++++++++++++ srcpkgs/glibc/template | 9 ++++---- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/glibc/patches/getpagesize_workaround_assertion.patch diff --git a/srcpkgs/glibc/glibc-devel.template b/srcpkgs/glibc/glibc-devel.template index a665982b31..a3991628f7 100644 --- a/srcpkgs/glibc/glibc-devel.template +++ b/srcpkgs/glibc/glibc-devel.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains files for development: headers, static libs, etc." +revision=1 + Add_dependency run kernel-libc-headers Add_dependency run glibc diff --git a/srcpkgs/glibc/patches/getpagesize_workaround_assertion.patch b/srcpkgs/glibc/patches/getpagesize_workaround_assertion.patch new file mode 100644 index 0000000000..f59eab064f --- /dev/null +++ b/srcpkgs/glibc/patches/getpagesize_workaround_assertion.patch @@ -0,0 +1,21 @@ +--- sysdeps/unix/sysv/linux/getpagesize.c.orig 2010-05-08 17:30:11.713092813 +0200 ++++ sysdeps/unix/sysv/linux/getpagesize.c 2010-05-08 17:30:40.031108986 +0200 +@@ -28,10 +28,6 @@ + int + __getpagesize () + { +-#ifdef __ASSUME_AT_PAGESIZE +- assert (GLRO(dl_pagesize) != 0); +- return GLRO(dl_pagesize); +-#else + if (GLRO(dl_pagesize) != 0) + return GLRO(dl_pagesize); + +@@ -47,7 +43,6 @@ __getpagesize () + return NBPC; + # endif /* NBPG. */ + # endif /* EXEC_PAGESIZE. */ +-#endif + } + libc_hidden_def (__getpagesize) + weak_alias (__getpagesize, getpagesize) diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 73eb9efe2a..30b4a12b7f 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,15 +1,16 @@ # Template file for 'glibc' pkgname=glibc version=2.12 +revision=1 distfiles="http://xbps.nopcode.org/distfiles/glibc-${version}.tar.bz2" build_style=gnu_configure build_wrksrc="build" configure_script="../configure" configure_args="--with-tls -disable-profile --with-__thread - --enable-kernel=2.6.27 --enable-add-ons --without-gd - --without-cvs --without-selinux --libexecdir=/usr/lib - --libdir=/usr/lib --enable-stackguard-randomization - --with-headers=$XBPS_MASTERDIR/usr/include" +--enable-kernel=2.6.27 --enable-add-ons --without-gd +--without-cvs --without-selinux --libexecdir=/usr/lib +--libdir=/usr/lib --enable-stackguard-randomization +--with-headers=$XBPS_MASTERDIR/usr/include" make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install" short_desc="The GNU C library" maintainer="Juan RP "