Author: adconrad
Date: 2012-11-25 07:17:19 +0000 (Sun, 25 Nov 2012)
New Revision: 5400
Added:
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection1.diff
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection2.diff
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection3.diff
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/patches/series
Log:
Add patches/any/cvs-cxxheaders-detection[1-3].diff to bring us up to date
with my C++ header detection patch on glibc trunk, for g++-4.7_4.7.2-10.
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-24 16:20:48 UTC
(rev 5399)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-25 07:17:19 UTC
(rev 5400)
@@ -1,5 +1,9 @@
eglibc (2.16-0experimental1) UNRELEASED; urgency=low
+ [ Adam Conrad ]
+ * Add patches/any/cvs-cxxheaders-detection[1-3].diff to bring us up to date
+ with my C++ header detection patch on glibc trunk, for g++-4.7_4.7.2-10.
+
[ Aurelien Jarno ]
* Add patches/m68k/cvs-syscall-arguments.diff to fix cancellable syscall
with 5 or 6 arguments. Closes: #693852.
Added:
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection1.diff
===================================================================
---
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection1.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection1.diff
2012-11-25 07:17:19 UTC (rev 5400)
@@ -0,0 +1,50 @@
+commit c4e85184d2ded3f6a259948098a0c297a9cf0be6
+Author: Allan McRae <al...@archlinux.org>
+Date: Thu Sep 6 00:16:24 2012 +1000
+
+ Improve C++ header location detection (bug 13966)
+
+diff --git a/configure b/configure
+index 6718bee..d159ce0 100755
+--- a/configure
++++ b/configure
+@@ -5345,13 +5345,11 @@ if test -n "$sysheaders"; then
+ CXX_SYSINCLUDES=
+ cxxversion=`$CXX -dumpversion 2>&5` &&
+ cxxmachine=`$CXX -dumpmachine 2>&5` &&
+- for d in include "$cxxmachine/include"; do
+- i=../../../../$d/c++/$cxxversion
+- cxxheaders=`$CXX -print-file-name="$i"` &&
+- test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
+- CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
++ cxxplus=`$CXX -print-prog-name=cc1plus`
++ cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/
//'`
++ test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
++ CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
+ -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
+- done
+ fi
+ fi
+
+diff --git a/configure.in b/configure.in
+index 7de4b09..a174646 100644
+--- a/configure.in
++++ b/configure.in
+@@ -975,13 +975,11 @@ if test -n "$sysheaders"; then
+ CXX_SYSINCLUDES=
+ cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
+ cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` &&
+- for d in include "$cxxmachine/include"; do
+- i=../../../../$d/c++/$cxxversion
+- cxxheaders=`$CXX -print-file-name="$i"` &&
+- test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
+- CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
++ cxxplus=`$CXX -print-prog-name=cc1plus`
++ cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/
//'`
++ test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
++ CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
+ -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
+- done
+ fi
+ fi
+ AC_SUBST(SYSINCLUDES)
Added:
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection2.diff
===================================================================
---
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection2.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection2.diff
2012-11-25 07:17:19 UTC (rev 5400)
@@ -0,0 +1,40 @@
+commit 1e4a95361c71e8073f448012c3eeb6f09cc9a814
+Author: Joseph Myers <jos...@codesourcery.com>
+Date: Wed Oct 10 22:07:36 2012 +0000
+
+ Use $CXX not cc1plus to locate C++ headers.
+
+diff --git a/configure b/configure
+index a5e9316..74ff690 100755
+--- a/configure
++++ b/configure
+@@ -5342,10 +5342,9 @@ if test -n "$sysheaders"; then
+ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
+ if test -n "$CXX"; then
+ CXX_SYSINCLUDES=
+- cxxversion=`$CXX -dumpversion 2>&5` &&
+ cxxmachine=`$CXX -dumpmachine 2>&5` &&
+- cxxplus=`$CXX -print-prog-name=cc1plus`
+- cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/
//'`
++ cxxheaders=`$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
++ | sed -n -e '1,/#include/d' -e '/^ \//{p;q;}' | sed 's/ //'`
+ test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
+ CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
+ -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
+diff --git a/configure.in b/configure.in
+index b9b5703..facde5e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -973,10 +973,9 @@ if test -n "$sysheaders"; then
+ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
+ if test -n "$CXX"; then
+ CXX_SYSINCLUDES=
+- cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
+ cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` &&
+- cxxplus=`$CXX -print-prog-name=cc1plus`
+- cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/
//'`
++ cxxheaders=`$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
++ | sed -n -e '1,/#include/d' -e '/^ \//{p;q;}' | sed 's/ //'`
+ test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
+ CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
+ -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
Added:
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection3.diff
===================================================================
---
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection3.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-cxxheaders-detection3.diff
2012-11-25 07:17:19 UTC (rev 5400)
@@ -0,0 +1,54 @@
+commit 6706074627da7734d21f0024b6f7fb58b5629d6b
+Author: Adam Conrad <adcon...@0c3.net>
+Date: Sat Nov 24 23:58:38 2012 -0700
+
+ Fix C++ header directory detection for non-standard paths.
+
+ Stop assuming specific path layouts for C++ headers, and instead
+ use an autodetection method that looks for paths with '/[cg]++'
+ in the g++ include list.
+
+diff --git a/configure b/configure
+index ff2d34c..8799b7d 100755
+--- a/configure
++++ b/configure
+@@ -5423,12 +5423,11 @@ if test -n "$sysheaders"; then
+ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
+ if test -n "$CXX"; then
+ CXX_SYSINCLUDES=
+- cxxmachine=`$CXX -dumpmachine 2>&5` &&
+- cxxheaders=`$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
+- | sed -n -e '1,/#include/d' -e '/^ \//{p;q;}' | sed 's/ //'`
+- test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
+- CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
+--isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
++ for cxxheaders in `$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
++ | sed -n -e '1,/#include/d' -e 's/^ \(\/.*\/[cg]++\)/\1/p'`; do
++ test "x$cxxheaders" != x &&
++ CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders"
++ done
+ fi
+ fi
+
+diff --git a/configure.in b/configure.in
+index a7f7198..d369382 100644
+--- a/configure.in
++++ b/configure.in
+@@ -995,12 +995,11 @@ if test -n "$sysheaders"; then
+ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
+ if test -n "$CXX"; then
+ CXX_SYSINCLUDES=
+- cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` &&
+- cxxheaders=`$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
+- | sed -n -e '1,/#include/d' -e '/^ \//{p;q;}' | sed 's/ //'`
+- test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
+- CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
+--isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
++ for cxxheaders in `$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
++ | sed -n -e '1,/#include/d' -e 's/^ \(\/.*\/[cg]++\)/\1/p'`; do
++ test "x$cxxheaders" != x &&
++ CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders"
++ done
+ fi
+ fi
+ AC_SUBST(SYSINCLUDES)
Modified: glibc-package/branches/eglibc-2.16/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/series 2012-11-24
16:20:48 UTC (rev 5399)
+++ glibc-package/branches/eglibc-2.16/debian/patches/series 2012-11-25
07:17:19 UTC (rev 5400)
@@ -241,3 +241,6 @@
any/local-disable-libnss-db.diff
any/local-sunrpc-dos.diff
any/local-revert-bz13979.diff
+any/cvs-cxxheaders-detection1.diff
+any/cvs-cxxheaders-detection2.diff
+any/cvs-cxxheaders-detection3.diff
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tcwst-0002uu...@vasks.debian.org
