aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2013-08-30 14:37:31 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2013-08-30 14:37:31 +0000
commit20dd3342f7a9b550c6ce567f0fd4ed96c70c6fbe (patch)
tree308ce24f164bdddc6b4be32547fbe5fe1889da81
parent70cd9f32c7262973ff403182978a28195a352f37 (diff)
Fix an upstream problem in glibc
Update to linix-3.10.10 git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10330 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter05/glibc.xml4
-rw-r--r--chapter06/glibc.xml5
-rw-r--r--general.ent4
-rw-r--r--packages.ent6
4 files changed, 14 insertions, 5 deletions
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 94928996d..0691ddbfb 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -52,6 +52,10 @@
su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc'
fi</userinput></screen>
+ <para>An upstream change needs to be reverted:</para>
+
+<screen><userinput remap="pre">sed -i -e 's/static __m128i/inline &amp;/' sysdeps/x86_64/multiarch/strstr.c</userinput></screen>
+
<para>The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:</para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 485f0d7d4..45102933e 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -61,6 +61,11 @@
Glibc autoconf tests would give false results and defeat the goal
of achieving a clean build.</para>
+ <para>An upstream change needs to be reverted:</para>
+
+<screen><userinput remap="pre">sed -i -e 's/static __m128i/inline &amp;/' sysdeps/x86_64/multiarch/strstr.c</userinput></screen>
+
+
<para>The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:</para>
diff --git a/general.ent b/general.ent
index 2ef4cfe06..250017cd5 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20130822">
-<!ENTITY releasedate "August 22, 2013">
+<!ENTITY version "SVN-20130830">
+<!ENTITY releasedate "August 30, 2013">
<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.4">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index b89409fdc..5d1787162 100644
--- a/packages.ent
+++ b/packages.ent
@@ -339,12 +339,12 @@
<!ENTITY linux-major-version "3">
<!ENTITY linux-minor-version "10">
-<!ENTITY linux-patch-version "9">
+<!ENTITY linux-patch-version "10">
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "71,495 KB">
+<!ENTITY linux-size "71,492 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "28d1e1117c30fdd861f70ac0f9b677aa">
+<!ENTITY linux-md5 "647f76225dd6bc112369ba573ba3de18">
<!ENTITY linux-home "http://www.kernel.org/">
<!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine,