[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-264-g6c613c4

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  6c613c435589b13eb5779e331b45f42c0958a6d4 (commit)
      from  314c1831f0157fda49695c3e2f65c7641836e3cb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6c613c435589b13eb5779e331b45f42c0958a6d4
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Mon Aug 12 02:26:15 2013 -0500

    Update ppc/ppc64 eglibc qecvt patch.

diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 246f7f8..0bc50bb 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -138,9 +138,9 @@
 
 <!-- Start of ppc/ppc64 patches -->
 
-<!ENTITY eglibc-qecvt-patch "eglibc-&eglibc-version;-qecvt-1.patch">
-<!ENTITY eglibc-qecvt-patch-md5 "06e5e2529e96ad144ca232887a2055b5">
-<!ENTITY eglibc-qecvt-patch-size ".859 KB">
+<!ENTITY eglibc-qecvt-patch "eglibc-&eglibc-version;-qecvt-2.patch">
+<!ENTITY eglibc-qecvt-patch-md5 "002efdbed2db76b6fabfd93e19d9f54f">
+<!ENTITY eglibc-qecvt-patch-size "1.835 KB">
 
 <!ENTITY gcc-nof-patch "gcc-&gcc-version;-powerpc64_multilib-1.patch">
 <!ENTITY gcc-nof-patch-md5 "cb19503a9c3e4d155dec55a8a74292ee">
diff --git a/patches/eglibc-2.17-qecvt-1.patch b/patches/eglibc-2.17-qecvt-1.patch
deleted file mode 100644
index 41512c0..0000000
--- a/patches/eglibc-2.17-qecvt-1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Submitted By: William Harrington kb0iic at cross-lfs dot org.
-Date: 2013-01-13
-Initial Package Version: 2.15
-Upstream Status: Unknown
-Origin: http://sourceware.org/bugzilla/show_bug.cgi?id=15007
-Description: Fixes a mismatch of guards around qcvt and friends.
-
-Redone for eglibc-2.17 on 2013-06-05
-
-diff -Naur eglibc-2.17.orig/stdlib/bits/stdlib-ldbl.h eglibc-2.17/stdlib/bits/stdlib-ldbl.h
---- eglibc-2.17.orig/stdlib/bits/stdlib-ldbl.h	2013-06-05 16:56:48.000000000 +0000
-+++ eglibc-2.17/stdlib/bits/stdlib-ldbl.h	2013-06-05 18:46:39.012840463 +0000
-@@ -30,7 +30,8 @@
- __LDBL_REDIR1_DECL (strtold_l, strtod_l)
- #endif
- 
--#if defined __USE_SVID || defined __USE_XOPEN_EXTENDED
-+#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8) \
-+    || defined __USE_SVID 
- # ifdef __USE_MISC
- __LDBL_REDIR1_DECL (qecvt, ecvt)
- __LDBL_REDIR1_DECL (qfcvt, fcvt)
diff --git a/patches/eglibc-2.17-qecvt-2.patch b/patches/eglibc-2.17-qecvt-2.patch
new file mode 100644
index 0000000..9acdb7f
--- /dev/null
+++ b/patches/eglibc-2.17-qecvt-2.patch
@@ -0,0 +1,51 @@
+Submitted By: William Harrington kb0iic at cross-lfs dot org.
+Date: 2013-08-12
+Initial Package Version: 2.17
+Upstream Status: Applied to 2.18 
+Origin: http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4220c3ef773c0e7fff7c95ecd7cff69886fe4c0e
+Description: Fixes a mismatch of guards around qcvt and friends.
+
+Redone for eglibc-2.17 on 2013-08-12
+
+diff -Naur eglibc-2.17.orig/stdlib/bits/stdlib-ldbl.h eglibc-2.17/stdlib/bits/stdlib-ldbl.h
+--- eglibc-2.17.orig/stdlib/bits/stdlib-ldbl.h	2012-02-18 02:24:59.000000000 +0000
++++ eglibc-2.17/stdlib/bits/stdlib-ldbl.h	2013-08-11 22:09:07.000000000 +0000
+@@ -30,12 +30,10 @@
+ __LDBL_REDIR1_DECL (strtold_l, strtod_l)
+ #endif
+ 
+-#if defined __USE_SVID || defined __USE_XOPEN_EXTENDED
+-# ifdef __USE_MISC
++#ifdef __USE_MISC
+ __LDBL_REDIR1_DECL (qecvt, ecvt)
+ __LDBL_REDIR1_DECL (qfcvt, fcvt)
+ __LDBL_REDIR1_DECL (qgcvt, gcvt)
+ __LDBL_REDIR1_DECL (qecvt_r, ecvt_r)
+ __LDBL_REDIR1_DECL (qfcvt_r, fcvt_r)
+-# endif
+ #endif
+diff -Naur eglibc-2.17.orig/stdlib/stdlib.h eglibc-2.17/stdlib/stdlib.h
+--- eglibc-2.17.orig/stdlib/stdlib.h	2012-11-09 22:50:35.000000000 +0000
++++ eglibc-2.17/stdlib/stdlib.h	2013-08-11 22:06:29.000000000 +0000
+@@ -819,8 +819,9 @@
+ extern char *gcvt (double __value, int __ndigit, char *__buf)
+      __THROW __nonnull ((3)) __wur;
+ 
++#endif
+ 
+-# ifdef __USE_MISC
++#ifdef __USE_MISC
+ /* Long double versions of above functions.  */
+ extern char *qecvt (long double __value, int __ndigit,
+ 		    int *__restrict __decpt, int *__restrict __sign)
+@@ -849,9 +850,7 @@
+ 		    int *__restrict __decpt, int *__restrict __sign,
+ 		    char *__restrict __buf, size_t __len)
+      __THROW __nonnull ((3, 4, 5));
+-# endif	/* misc */
+-#endif	/* use MISC || use X/Open Unix */
+-
++#endif /* misc */
+ 
+ __BEGIN_NAMESPACE_STD
+ /* Return the length of the multibyte character

-----------------------------------------------------------------------

Summary of changes:
 BOOK/patches.ent                  |    6 ++--
 patches/eglibc-2.17-qecvt-1.patch |   22 ----------------
 patches/eglibc-2.17-qecvt-2.patch |   51 +++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 25 deletions(-)
 delete mode 100644 patches/eglibc-2.17-qecvt-1.patch
 create mode 100644 patches/eglibc-2.17-qecvt-2.patch


hooks/post-receive
-- 
Cross-LFS Book