Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=68ed3dbc9dcfe91902fb40b256b42a0212fdb2dc
commit 68ed3dbc9dcfe91902fb40b256b42a0212fdb2dc Author: Michel Hermier <[email protected]> Date: Fri Nov 18 12:16:07 2011 +0100 glibc-2.14.1-4-i686 * Bring back revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch (I forgot it is required for static linked binaries) diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index 4d77bca..58358ce 100644 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@ -11,7 +11,7 @@ USE_GLIBC_PORTS=${USE_GLIBC_PORTS:-$USE_GLIBC_PORTS_DEFAULT} pkgname=glibc pkgver=2.14.1 -pkgrel=3 +pkgrel=4 pkgdesc="GNU C Library" url="http://www.gnu.org/software/libc/libc.html" depends=() @@ -24,6 +24,7 @@ archs=('i686' 'x86_64' 'ppc' 'arm') Fup2gnubz2 source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.gz \ fix-missing-etc-hosts.patch \ + revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch \ nis.diff \ glibc2.14-revert-sunrpc-removal.patch \ glibc-2.14-revert-4768ae77.patch \ @@ -31,6 +32,7 @@ source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.gz \ glibc-2.14.1-fixes-1.patch) sha1sums=('d1e787f1f55eba4544e4847668cc1edb782622f7' \ 'be4a7bea8af743331e2c6704faa24b6cb4e155d5' \ + 'c8d14d0f2e239ba0def978010163e919a45700f7' \ '9c4544aee1063f65da39273349f0780d5723747d' \ '9e07221a0f200898a680ed8682569606e4d3abbe' \ 'cc22b01dc3d1a8d92b36a319e36ace98c5c55d80' \ diff --git a/source/base/glibc/revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch b/source/base/glibc/revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch new file mode 100644 index 0000000..6a1a292 --- /dev/null +++ b/source/base/glibc/revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch @@ -0,0 +1,56 @@ +diff -Naur glibc-2.12.1/sysdeps/unix/sysv/linux/getpagesize.c glibc-2.12.1-p/sysdeps/unix/sysv/linux/getpagesize.c +--- glibc-2.12.1/sysdeps/unix/sysv/linux/getpagesize.c 2010-07-27 13:34:39.000000000 +0200 ++++ glibc-2.12.1-p/sysdeps/unix/sysv/linux/getpagesize.c 2010-09-13 15:41:12.876000206 +0200 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1991,1992,1995-1997,2000,2002,2004,2010 ++/* Copyright (C) 1991,1992,1995-1997,2000,2002,2004 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -17,37 +17,30 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +-#include <assert.h> + #include <unistd.h> + #include <sys/param.h> + + #include <ldsodefs.h> +-#include <kernel-features.h> + + /* Return the system page size. */ + 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); + +-# ifdef EXEC_PAGESIZE ++#ifdef EXEC_PAGESIZE + return EXEC_PAGESIZE; +-# else /* No EXEC_PAGESIZE. */ +-# ifdef NBPG +-# ifndef CLSIZE +-# define CLSIZE 1 +-# endif /* No CLSIZE. */ ++#else /* No EXEC_PAGESIZE. */ ++#ifdef NBPG ++#ifndef CLSIZE ++#define CLSIZE 1 ++#endif /* No CLSIZE. */ + return NBPG * CLSIZE; +-# else /* No NBPG. */ ++#else /* No NBPG. */ + return NBPC; +-# endif /* NBPG. */ +-# endif /* EXEC_PAGESIZE. */ +-#endif ++#endif /* NBPG. */ ++#endif /* EXEC_PAGESIZE. */ + } + libc_hidden_def (__getpagesize) + weak_alias (__getpagesize, getpagesize) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
