diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6a5c1dd61..a22dfe5f6 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,16 @@
-->
+
+ 2014-03-24
+
+
+ [bdubbs] - Update to gcc-4.9. Fixes
+ #3553.
+
+
+
+
2014-03-23
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ac422b5a6..a7b81065f 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -76,9 +76,9 @@
Gawk &gawk-version;
-
+
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 9ebf763e7..182fad342 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -56,6 +56,7 @@ RANLIB=$LFS_TGT-ranlib \
../binutils-&binutils-version;/configure \
--prefix=/tools \
--disable-nls \
+ --disable-werror \
--with-lib-path=/tools/lib \
--with-sysroot
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 8ba097d10..61cb8af15 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -133,6 +133,8 @@ cd ../gcc-build
--disable-libquadmath \
--disable-libsanitizer \
--disable-libssp \
+ --disable-libvtv \
+ --disable-libcilkrts \
--disable-libstdc++-v3 \
--enable-languages=c,c++ \
--with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index d54cbe45e..ae8aff092 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -72,7 +72,9 @@ cd ../binutils-build
Prepare Binutils for compilation:
-../binutils-&binutils-version;/configure --prefix=/usr --enable-shared
+../binutils-&binutils-version;/configure --prefix=/usr \
+ --enable-shared \
+ --disable-werror
Compile the package:
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index c1a17648e..107500f8f 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -53,7 +53,8 @@
KILL=/bin/kill
HAVE_BLKID=1
BLKID_LIBS="-lblkid"
-BLKID_CFLAGS="-I/tools/include/blkid"
+BLKID_CFLAGS="-I/tools/include/blkid"
+cc_cv_CFLAGS__flto=no
EOF
Additionally, fix a build error when using Util-Linux built in
diff --git a/general.ent b/general.ent
index 5c5864715..a75f4a64f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/packages.ent b/packages.ent
index b8bb00c68..be0b9d1ad 100644
--- a/packages.ent
+++ b/packages.ent
@@ -206,10 +206,10 @@
-
-
+
+
-
+