patches/glibc/2.9/220-manual-no-perl.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Sep 07 01:22:37 2011 +0200 (2011-09-07)
branch1.12
changeset 2655 3ba359965eb0
parent 1201 c9967a6e3b25
permissions -rw-r--r--
scripts: fix sysroot prefix dir

The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .

Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.

Reported-by: Jonathan Grundon <JGrundon@xos.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from e5fc5c9ea78af28d05244ba09cf718cf75470903)
yann@1201
     1
Original patch from: gentoo/src/patchsets/glibc/2.9/1030_all_glibc-manual-no-perl.patch
yann@1201
     2
yann@1201
     3
-= BEGIN original header =-
yann@1201
     4
If we're using a cvs snapshot which updates the source files, and
yann@1201
     5
perl isn't installed yet, then we can't regen the docs.  Not a big
yann@1201
     6
deal, so just whine a little and continue on our merry way.
yann@1201
     7
yann@1201
     8
http://bugs.gentoo.org/60132
yann@1201
     9
yann@1201
    10
-= END original header =-
yann@1201
    11
yann@1201
    12
diff -durN glibc-2_9.orig/manual/Makefile glibc-2_9/manual/Makefile
yann@1201
    13
--- glibc-2_9.orig/manual/Makefile	2006-01-08 07:43:47.000000000 +0100
yann@1201
    14
+++ glibc-2_9/manual/Makefile	2009-02-02 22:00:53.000000000 +0100
yann@1201
    15
@@ -104,9 +104,14 @@
yann@1201
    16
 libm-err.texi: stamp-libm-err
yann@1201
    17
 stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
yann@1201
    18
 						     $(dir)/libm-test-ulps))
yann@1201
    19
+ifneq ($(PERL),no)
yann@1201
    20
 	pwd=`pwd`; \
yann@1201
    21
 	$(PERL) $< $$pwd/.. > libm-err-tmp
yann@1201
    22
 	$(move-if-change) libm-err-tmp libm-err.texi
yann@1201
    23
+else
yann@1201
    24
+	echo "Unable to rebuild math docs, no perl installed"
yann@1201
    25
+	touch libm-err.texi
yann@1201
    26
+endif
yann@1201
    27
 	touch $@
yann@1201
    28
 
yann@1201
    29
 # Generate Texinfo files from the C source for the example programs.