r2873 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2008-03-16 15:54:00 +0000 (Sun, 16 Mar 2008)
New Revision: 2873
Added:
glibc-package/trunk/debian/patches/any/cvs-gcc-4.3.diff
Removed:
glibc-package/trunk/debian/patches/any/submitted-gcc-4.3.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Replace any/submitted-gcc-4.3.diff by any/cvs-gcc-4.3.diff.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-03-15 13:45:17 UTC (rev 2872)
+++ glibc-package/trunk/debian/changelog 2008-03-16 15:54:00 UTC (rev 2873)
@@ -30,6 +30,7 @@
Closes: #469568.
* debian/rules.d/build.mk: disable testsuite on ARM machines running a
2.6.21 to 2.6.24 kernel.
+ * Replace any/submitted-gcc-4.3.diff by any/cvs-gcc-4.3.diff.
[ Samuel Thibault ]
* patches/hurd-i386/cvs-blocked-exceptions.diff: new patch to dump
@@ -39,7 +40,7 @@
* patches/hurd-i386/local-gcc-4.1-init-first.diff: Update and actually
apply.
- -- Aurelien Jarno <aurel32@debian.org> Wed, 12 Mar 2008 20:47:44 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 16 Mar 2008 16:52:46 +0100
glibc (2.7-9) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/cvs-gcc-4.3.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-gcc-4.3.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-gcc-4.3.diff 2008-03-16 15:54:00 UTC (rev 2873)
@@ -0,0 +1,49 @@
+commit 4400b128c82ef88061f9ab54fdb30737debce7cb
+Author: Roland McGrath <roland@gnu.org>
+Date: Fri Feb 1 00:20:07 2008 +0000
+
+ 2008-01-31 Roland McGrath <roland@redhat.com>
+
+ [BZ #5442]
+ * configure.in: Use -print-file-name if it yields a directory,
+ for each of include and include-fixed.
+ * configure: Regenerated.
+
+diff --git a/configure b/configure
+index 1f2cd4f..4b96978 100755
+--- a/configure
++++ b/configure
+@@ -5065,8 +5065,12 @@ echo "$as_me: WARNING:
+ # header directory and add that to the list. NOTE: Only does the right
+ # thing on a system that doesn't need fixincludes. (Not presently a problem.)
+ if test -n "$sysheaders"; then
+- ccheaders=`$CC -print-file-name=include`
+- SYSINCLUDES="-nostdinc -isystem $ccheaders \
++ SYSINCLUDES=-nostdinc
++ for d in include include-fixed; do
++ i=`$CC -print-file-name="$d"` && test "x$i" != "x$d" &&
++ SYSINCLUDES="$SYSINCLUDES -isystem $i"
++ done
++ SYSINCLUDES="$SYSINCLUDES \
+ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
+ if test -n "$CXX"; then
+ cxxversion=`$CXX -dumpversion 2>&5` &&
+diff --git a/configure.in b/configure.in
+index 6ea1b26..3098ebf 100644
+--- a/configure.in
++++ b/configure.in
+@@ -914,8 +914,12 @@ test -n "$aux_missing" && AC_MSG_WARN([
+ # header directory and add that to the list. NOTE: Only does the right
+ # thing on a system that doesn't need fixincludes. (Not presently a problem.)
+ if test -n "$sysheaders"; then
+- ccheaders=`$CC -print-file-name=include`
+- SYSINCLUDES="-nostdinc -isystem $ccheaders \
++ SYSINCLUDES=-nostdinc
++ for d in include include-fixed; do
++ i=`$CC -print-file-name="$d"` && test "x$i" != x && test "x$i" != "x$d" &&
++ SYSINCLUDES="$SYSINCLUDES -isystem $i"
++ done
++ SYSINCLUDES="$SYSINCLUDES \
+ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
+ if test -n "$CXX"; then
+ cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
Deleted: glibc-package/trunk/debian/patches/any/submitted-gcc-4.3.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-gcc-4.3.diff 2008-03-15 13:45:17 UTC (rev 2872)
+++ glibc-package/trunk/debian/patches/any/submitted-gcc-4.3.diff 2008-03-16 15:54:00 UTC (rev 2873)
@@ -1,32 +0,0 @@
-Index: configure
-===================================================================
-RCS file: /cvs/glibc/libc/configure,v
-retrieving revision 1.462
-diff -u -d -p -r1.462 configure
---- configure 24 Jan 2008 20:21:23 -0000 1.462
-+++ configure 31 Jan 2008 02:24:00 -0000
-@@ -5066,7 +5066,7 @@ echo "$as_me: WARNING:
- # thing on a system that doesn't need fixincludes. (Not presently a problem.)
- if test -n "$sysheaders"; then
- ccheaders=`$CC -print-file-name=include`
-- SYSINCLUDES="-nostdinc -isystem $ccheaders \
-+ SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \
- -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
- if test -n "$CXX"; then
- cxxversion=`$CXX -dumpversion 2>&5` &&
-Index: configure.in
-===================================================================
-RCS file: /cvs/glibc/libc/configure.in,v
-retrieving revision 1.472
-diff -u -d -p -r1.472 configure.in
---- configure.in 24 Jan 2008 20:21:23 -0000 1.472
-+++ configure.in 31 Jan 2008 02:24:00 -0000
-@@ -915,7 +915,7 @@ test -n "$aux_missing" && AC_MSG_WARN([
- # thing on a system that doesn't need fixincludes. (Not presently a problem.)
- if test -n "$sysheaders"; then
- ccheaders=`$CC -print-file-name=include`
-- SYSINCLUDES="-nostdinc -isystem $ccheaders \
-+ SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \
- -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
- if test -n "$CXX"; then
- cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2008-03-15 13:45:17 UTC (rev 2872)
+++ glibc-package/trunk/debian/patches/series 2008-03-16 15:54:00 UTC (rev 2873)
@@ -133,6 +133,7 @@
any/cvs-epoll_h.diff -p0
any/cvs-ether_line.diff -p0
any/cvs-fchmodat.diff -p1
+any/cvs-gcc-4.3.diff -p1
any/cvs-iconv-iso2022jp-loop-bug.diff
any/cvs-rfc3484.diff -p1
any/cvs-sched_h.diff -p0
@@ -186,7 +187,6 @@
any/submitted-getcwd-sys_param_h.diff -p0
any/submitted-clock-settime.diff -p0
any/submitted-date-and-unknown-tz.diff -p0
-any/submitted-gcc-4.3.diff -p0
any/submitted-ieee754_h.diff -p0
any/submitted-libgcc_s.so.diff -p0
any/submitted-longdouble.diff -p0
Reply to: