diff options
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 9 | ||||
| -rw-r--r-- | chapter06/make.xml | 4 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | patches.ent | 5 |
5 files changed, 30 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index ba13d7fb1..ad78050aa 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,10 +37,19 @@ --> <listitem> + <para>2012-08-26</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Apply upstream patches to make.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2012-08-24</para> <itemizedlist> <listitem> - <para>[ken] - remove redundant sed from automake.</para> + <para>[ken] - Remove redundant sed from automake.</para> </listitem> </itemizedlist> </listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 55672138e..a4fa2ecd1 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -240,6 +240,10 @@ </listitem> <listitem> + <para>&make-fixes-patch;</para> + </listitem> + + <listitem> <para>&perl-libc-patch;</para> </listitem> @@ -250,6 +254,11 @@ <listitem> <para>&sed-testsuite-patch;</para> </listitem> + + <listitem> + <para>tzdata &tzdata-version;</para> + </listitem> + <!-- Added and removed in this cycle <listitem> <para>popt&popt-version;</para> diff --git a/chapter06/make.xml b/chapter06/make.xml index 791908683..2faaa177a 100644 --- a/chapter06/make.xml +++ b/chapter06/make.xml @@ -40,6 +40,10 @@ <sect2 role="installation"> <title>Installation of Make</title> + <para>First apply some upstream patches:</para> + +<screen><userinput remap="configure">patch -Np1 -i ../&make-fixes-patch;</userinput></screen> + <para>Prepare Make for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> diff --git a/general.ent b/general.ent index 9f0e237e4..b0838923d 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20120824"> -<!ENTITY releasedate "August 24, 2012"> +<!ENTITY version "SVN-20120826"> +<!ENTITY releasedate "August 26, 2012"> <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.2"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/patches.ent b/patches.ent index 39c893636..a1faeaed6 100644 --- a/patches.ent +++ b/patches.ent @@ -59,6 +59,11 @@ <!ENTITY kmod-testsuite-patch-size "2.2 KB"> +<!ENTITY make-fixes-patch "make-&make-version;-upstream_fixes-2.patch"> +<!ENTITY make-fixes-md5 "02c0f3989185a7345233872b1ae5f46d"> +<!ENTITY make-fixes-patch-size "9.7 KB"> + + <!ENTITY patch-test-patch "patch-&patch-version;-test_fix-1.patch"> <!ENTITY patch-test-patch-md5 "c51e1a95bfc5310635d05081472c3534"> <!ENTITY patch-test-patch-size "1 KB"> |