Christian Wiese
13 years ago
9 changed files with 22 additions and 306 deletions
@ -1,36 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../glibc/glibc-2.13-do-not-link-nss_test1.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
Origin: Linuxfromscratch Project
|
||||
|
||||
test-installation.pl script in that it tries to link a test program to a
|
||||
library that isn't installed by make install
|
||||
|
||||
LFS is using the following sed command to fix it:
|
||||
|
||||
sed -i -e 's/"db1"/& \&\& $name ne "nss_test1"/' scripts/test-installation.pl
|
||||
|
||||
--- glibc-2.13/scripts/test-installation.pl.orig 2011-08-22 09:41:35.640080447 +0200
|
||||
+++ glibc-2.13/scripts/test-installation.pl 2011-08-22 09:42:02.828085678 +0200
|
||||
@@ -105,7 +105,7 @@
|
||||
# - libdb1 since it conflicts with libdb
|
||||
# - libnss1_* from glibc-compat add-on
|
||||
# - libthread_db since it contains unresolved references
|
||||
- if ($name ne "nss_ldap" && $name ne "db1"
|
||||
+ if ($name ne "nss_ldap" && $name ne "db1" && $name ne "nss_test1"
|
||||
&& !($name =~/^nss1_/) && $name ne "thread_db") {
|
||||
$link_libs .= " -l$name";
|
||||
$versions{$name} = $version;
|
||||
@ -1,65 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../glibc/glibc-2.13-gcc_fix-1.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
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
|
||||
@ -1,77 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../glibc/glibc-2.14-reexport-rpc-interface.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From 74c9f73df627d015e171089ad44e0e752cbf1fe5 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schwab <schwab@redhat.com>
|
||||
Date: Thu, 12 May 2011 17:30:08 +0200
|
||||
Subject: [PATCH 1/2] Reexport RPC interface
|
||||
|
||||
---
|
||||
NEWS | 10 ----------
|
||||
include/libc-symbols.h | 2 +-
|
||||
sunrpc/Makefile | 2 +-
|
||||
3 files changed, 2 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index bb517c2..6504f81 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -27,16 +27,6 @@ Version 2.14
|
||||
12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
|
||||
12795, 12811, 12813, 12814, 12841
|
||||
|
||||
-* The RPC implementation in libc is obsoleted. Old programs keep working
|
||||
- but new programs cannot be linked with the routines in libc anymore.
|
||||
- Programs in need of RPC functionality must be linked against TI-RPC.
|
||||
- The TI-RPC implementation is IPv6 enabled and there are other benefits.
|
||||
-
|
||||
- Visible changes of this change include (obviously) the inability to link
|
||||
- programs using RPC functions without referencing the TI-RPC library and the
|
||||
- removal of the RPC headers from the glibc headers.
|
||||
- Implemented by Ulrich Drepper.
|
||||
-
|
||||
* New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,
|
||||
syncfs, setns, sendmmsg
|
||||
|
||||
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
|
||||
index 67e1ca2..5e7cca5 100644
|
||||
--- a/include/libc-symbols.h
|
||||
+++ b/include/libc-symbols.h
|
||||
@@ -635,7 +635,7 @@ for linking")
|
||||
# define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
||||
# define libc_hidden_def(name) hidden_def (name)
|
||||
# define libc_hidden_weak(name) hidden_weak (name)
|
||||
-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
|
||||
+# define libc_hidden_nolink(name, version) hidden_def (name)
|
||||
# define libc_hidden_ver(local, name) hidden_ver (local, name)
|
||||
# define libc_hidden_data_def(name) hidden_data_def (name)
|
||||
# define libc_hidden_data_weak(name) hidden_data_weak (name)
|
||||
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
|
||||
index 7245deb..5a47da8 100644
|
||||
--- a/sunrpc/Makefile
|
||||
+++ b/sunrpc/Makefile
|
||||
@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
|
||||
des_crypt.h)
|
||||
headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
|
||||
$(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
|
||||
-headers = rpc/netdb.h
|
||||
+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
|
||||
install-others = $(inst_sysconfdir)/rpc
|
||||
generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
|
||||
$(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
|
||||
--
|
||||
1.7.2.3
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From cd85f89a1383fcdaca5ab3ead536047192527579 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schwab <schwab@redhat.com>
|
||||
Date: Tue, 17 May 2011 17:42:30 +0200
|
||||
Subject: [PATCH 2/2] Reinstall NIS RPC headers
|
||||
|
||||
---
|
||||
nis/Makefile | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/nis/Makefile b/nis/Makefile
|
||||
index e7e5f0c..f63ada6 100644
|
||||
--- a/nis/Makefile
|
||||
+++ b/nis/Makefile
|
||||
@@ -23,9 +23,9 @@ subdir := nis
|
||||
|
||||
aux := nis_hash
|
||||
|
||||
+headers := $(wildcard rpcsvc/*.[hx])
|
||||
distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
|
||||
- nisplus-parser.h nis_xdr.h nss \
|
||||
- $(wildcard rpcsvc/*.[hx])
|
||||
+ nisplus-parser.h nis_xdr.h nss
|
||||
|
||||
# These are the databases available for the nis (and perhaps later nisplus)
|
||||
# service. This must be a superset of the services in nss.
|
||||
--
|
||||
1.7.2.3
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../glibc/x86-i686.patch
|
||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
__i686 is used in assembler, but when optimizing for a 686-class CPU
|
||||
gcc defines __i686 as cpp macro ...
|
||||
|
||||
- Rene Rebe <rene@exactcode.de>
|
||||
|
||||
--- glibc-20050919/csu/defs.awk.vanilla 2005-11-03 13:16:56.000000000 +0100
|
||||
+++ glibc-20050919/csu/defs.awk 2005-11-03 13:17:10.000000000 +0100
|
||||
@@ -24,4 +24,5 @@
|
||||
|
||||
print "#include <libc-symbols.h>";
|
||||
print "weak_extern (__gmon_start__)";
|
||||
+ print "#undef __i686";
|
||||
}
|
||||
--- glibc-20050919/sysdeps/i386/bp-asm.h.vanilla 2005-11-03 14:27:22.000000000 +0100
|
||||
+++ glibc-20050919/sysdeps/i386/bp-asm.h 2005-11-03 14:27:39.000000000 +0100
|
||||
@@ -22,6 +22,8 @@
|
||||
#ifndef _bp_asm_h_
|
||||
# define _bp_asm_h_ 1
|
||||
|
||||
+#undef __i686
|
||||
+
|
||||
# if __ASSEMBLER__
|
||||
|
||||
# if __BOUNDED_POINTERS__
|
||||
Loading…
Reference in new issue