Patchwork fix eglibc-2.16 manual build

login
register
mail settings
Submitter Johannes Stezenbach
Date Oct. 22, 2012, 1:32 p.m.
Message ID <20121022133228.GA16536@sig21.net>
Download mbox | patch
Permalink /patch/193156/
State Accepted
Commit 17cdb10b1675
Headers show

Comments

Johannes Stezenbach - Oct. 22, 2012, 1:32 p.m.
Signed-off-by: Johannes Stezenbach <js@sig21.net>


--
For unsubscribe information see http://sourceware.org/lists.html#faq
Yann E. MORIN - Oct. 28, 2012, 6 p.m.
Johannes, All,

Your patch:
    fix eglibc-2.16 manual build

has been applied as: #17cdb10b1675
    http://crosstool-ng.org/hg/crosstool-ng/rev/17cdb10b1675

Thank you!

Regards,
Yann E. MORIN.



--
For unsubscribe information see http://sourceware.org/lists.html#faq

Patch

diff -r 0e06812acc5c scripts/build/libc/glibc-eglibc.sh-common
--- a/scripts/build/libc/glibc-eglibc.sh-common	Wed Sep 26 16:41:02 2012 +0200
+++ b/scripts/build/libc/glibc-eglibc.sh-common	Mon Oct 22 15:31:57 2012 +0200
@@ -453,11 +453,16 @@ 
             # Omit JOBSFLAGS as GLIBC has problems building the
             # manuals in parallel
             CT_DoExecLog ALL make pdf html
-            # EGLIBC doesn't have a install-{pdf.html} and leaves the manuals
-            # in the source directory
+            # EGLIBC doesn't have a install-{pdf.html}, and older
+            # versions leave the manuals in the source directory
             CT_DoExecLog ALL mkdir -p ${CT_PREFIX_DIR}/share/doc
-            CT_DoExecLog ALL cp -av ${src_dir}/manual/*.pdf ${src_dir}/manual/libc \
-                ${CT_PREFIX_DIR}/share/doc
+            if [ ${CT_LIBC_EGLIBC_2_16_or_later} = "y" ]; then
+                CT_DoExecLog ALL cp -av manual/*.pdf manual/libc \
+                    ${CT_PREFIX_DIR}/share/doc
+            else
+                CT_DoExecLog ALL cp -av ${src_dir}/manual/*.pdf ${src_dir}/manual/libc \
+                    ${CT_PREFIX_DIR}/share/doc
+            fi
         fi
 
         if [ "${CT_LIBC_LOCALES}" = "y" ]; then