Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=f252741bf1d41bc6fb97a3af747bb0ccd490f3e6
commit f252741bf1d41bc6fb97a3af747bb0ccd490f3e6 Author: Michel Hermier <[email protected]> Date: Fri Nov 18 08:28:28 2011 +0100 glibc-2.14.1-3-i686 * Replace source/base/glibc/gcc45.patch with more precize source/base/glibc/glibc-2.14.1-gcc_fix-1.patch. * Drop now unecessary revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch. * Add glibc-2.14-revert-4768ae77.patch that helps name resolutions for me. diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index 1550390..4d77bca 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=2 +pkgrel=3 pkgdesc="GNU C Library" url="http://www.gnu.org/software/libc/libc.html" depends=() @@ -24,17 +24,17 @@ archs=('i686' 'x86_64' 'ppc' 'arm') Fup2gnubz2 source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.gz \ fix-missing-etc-hosts.patch \ - gcc45.patch \ - revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch \ nis.diff \ glibc2.14-revert-sunrpc-removal.patch \ + glibc-2.14-revert-4768ae77.patch \ + glibc-2.14.1-gcc_fix-1.patch \ glibc-2.14.1-fixes-1.patch) sha1sums=('d1e787f1f55eba4544e4847668cc1edb782622f7' \ 'be4a7bea8af743331e2c6704faa24b6cb4e155d5' \ - '2283966c4f48bbc9b6ad0ae3bbd64601c057c721' \ - 'c8d14d0f2e239ba0def978010163e919a45700f7' \ '9c4544aee1063f65da39273349f0780d5723747d' \ '9e07221a0f200898a680ed8682569606e4d3abbe' \ + 'cc22b01dc3d1a8d92b36a319e36ace98c5c55d80' \ + '41a88bf6a20926a4a1e9792ae5eb2a9854dc44af' \ 'cc8fe170befc0a1fe56d6c18da1afc73c8c72b1b') if Fuse GLIBC_PORTS; then @@ -57,7 +57,7 @@ build() mkdir ../glibc-build || Fdie cd ../glibc-build || Fdie - GLIBOPTS="--prefix=/usr \ + GLIBOPTS="--prefix=/usr \ --libdir=/usr/lib \ --with-tls \ --with-__thread \ diff --git a/source/base/glibc/gcc45.patch b/source/base/glibc/gcc45.patch deleted file mode 100644 index 28d5dd4..0000000 --- a/source/base/glibc/gcc45.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes diff --git a/source/base/glibc/glibc-2.14-revert-4768ae77.patch b/source/base/glibc/glibc-2.14-revert-4768ae77.patch new file mode 100644 index 0000000..74db4ec --- /dev/null +++ b/source/base/glibc/glibc-2.14-revert-4768ae77.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; diff --git a/source/base/glibc/glibc-2.14.1-gcc_fix-1.patch b/source/base/glibc/glibc-2.14.1-gcc_fix-1.patch new file mode 100644 index 0000000..02920c1 --- /dev/null +++ b/source/base/glibc/glibc-2.14.1-gcc_fix-1.patch @@ -0,0 +1,49 @@ +Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> +Date: 2010-04-18 +Initial Package Version: 2.11.1 +Upstream Status: Not Submitted +Origin: http://www.eglibc.org/archives/patches/msg00073.html +Description: Fixes the following build problem with GCC-4.5.0: + +/mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT /mnt/lfs/sources/libc-build/math/s_frexp.os +./sysdeps/i386/fpu/s_frexp.S: Assembler messages: +./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef" +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `.' +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' +./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in .size directive +./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if" +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression +make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1 + +diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c +--- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c 2009-12-08 20:10:20.000000000 +0000 ++++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c 2010-04-17 11:34:06.882681001 +0000 +@@ -45,6 +45,11 @@ + /* Embed an #include to pull in the alignment and .end directives. */ + asm ("\n#include \"defs.h\""); + ++asm ("\n#if defined __i686 && defined __ASSEMBLER__"); ++asm ("\n#undef __i686"); ++asm ("\n#define __i686 __i686"); ++asm ("\n#endif"); ++ + /* The initial common code ends here. */ + asm ("\n/*@HEADER_ENDS*/"); + +diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h +--- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2009-12-08 20:10:20.000000000 +0000 ++++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-04-17 11:34:06.882681001 +0000 +@@ -29,6 +29,10 @@ + #include <dl-sysdep.h> + #include <tls.h> + ++#if defined __i686 && defined __ASSEMBLER__ ++#undef __i686 ++#define __i686 __i686 ++#endif + + /* For Linux we can use the system call table in the header file + /usr/include/asm/unistd.h diff --git a/source/base/glibc/revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch b/source/base/glibc/revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch deleted file mode 100644 index 6a1a292..0000000 --- a/source/base/glibc/revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch +++ /dev/null @@ -1,56 +0,0 @@ -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
