eglibc-2.16 manual

eglibc-2.16 manual

[Johannes Stezenbach]

Hi,

building the pdf manuals fails for eglibc-2.16 in the step
which copies the finished docs.  This is the change
I used to make the build succeed:

diff -r c94bf1e11db2 scripts/build/libc/glibc-eglibc.sh-common
--- a/scripts/build/libc/glibc-eglibc.sh-common	Mon Oct 15 11:48:02 2012 +0200
+++ b/scripts/build/libc/glibc-eglibc.sh-common	Wed Oct 17 10:43:43 2012 +0200
@@ -453,10 +453,9 @@
             # 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}
             CT_DoExecLog ALL mkdir -p ${CT_PREFIX_DIR}/share/doc
-            CT_DoExecLog ALL cp -av ${src_dir}/manual/*.pdf ${src_dir}/manual/libc \
+            CT_DoExecLog ALL cp -av manual/*.pdf manual/libc \
                 ${CT_PREFIX_DIR}/share/doc
         fi
 

The question is which version of eglibc fixed the manual build location,
and how to apply this change in ct-ng so it doesn't break it for older
eglibc versions?


Cheers,
Johannes

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

Re: eglibc-2.16 manual

[Yann E. MORIN]

Johannes, All,

On Wednesday 17 October 2012 Johannes Stezenbach wrote:
> building the pdf manuals fails for eglibc-2.16 in the step
> which copies the finished docs.  This is the change
> I used to make the build succeed:
[--SNIP--]
> The question is which version of eglibc fixed the manual build location,
> and how to apply this change in ct-ng so it doesn't break it for older
> eglibc versions?

Two options:
  - bisect: find the version that changed the behavior, add a config knob
    LIBC_EGLIBC_X_YY_or_later, and choose the manual location depending on
    this option
  - look in the build dir if manual are present, otherwise fallback to
    looking in the src dir.

Bisect is (somewhat) better, but looking in build dir might be easier.
Your pick, I don't really mind.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

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

Re: eglibc-2.16 manual

[Johannes Stezenbach]

Hi Yann,

On Mon, Oct 22, 2012 at 12:16:04AM +0200, Yann E. MORIN wrote:
> On Wednesday 17 October 2012 Johannes Stezenbach wrote:
> > building the pdf manuals fails for eglibc-2.16 in the step
> > which copies the finished docs.  This is the change
> > I used to make the build succeed:
> [--SNIP--]
> > The question is which version of eglibc fixed the manual build location,
> > and how to apply this change in ct-ng so it doesn't break it for older
> > eglibc versions?
> 
> Two options:
>   - bisect: find the version that changed the behavior, add a config knob
>     LIBC_EGLIBC_X_YY_or_later, and choose the manual location depending on
>     this option
>   - look in the build dir if manual are present, otherwise fallback to
>     looking in the src dir.
> 
> Bisect is (somewhat) better, but looking in build dir might be easier.
> Your pick, I don't really mind.

How about if I just send a patch using CT_LIBC_EGLIBC_2_16_or_later
and leave it to someone else to care about older eglibc versions?
I've done several build experiments with eglibc already,
for the moment I think it's enough ;-)

Thanks,
Johannes

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

[PATCH] fix eglibc-2.16 manual build

[Johannes Stezenbach]

Signed-off-by: Johannes Stezenbach <js@sig21.net>

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

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

fix eglibc-2.16 manual build

[Yann E. MORIN]

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