vapier      15/08/21 21:15:49

  Modified:             README.history
  Added:               
                        
00_all_0020-manual-skip-build-when-perl-is-unavailable.patch
  Log:
  fix from upstream for building w/out perl available #552020

Revision  Changes    Path
1.6                  src/patchsets/glibc/2.22/README.history

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/README.history?rev=1.6&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/README.history?rev=1.6&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/README.history?r1=1.5&r2=1.6

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.22/README.history,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- README.history      18 Aug 2015 12:59:11 -0000      1.5
+++ README.history      21 Aug 2015 21:15:49 -0000      1.6
@@ -1,3 +1,6 @@
+6              21 Aug 2015
+       + 00_all_0020-manual-skip-build-when-perl-is-unavailable.patch
+
 5              18 Aug 2015
        + 00_all_0019-hppa-start.S-rework-references-to-fix-PIE-TEXTRELs-B.patch
 



1.1                  
src/patchsets/glibc/2.22/00_all_0020-manual-skip-build-when-perl-is-unavailable.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/00_all_0020-manual-skip-build-when-perl-is-unavailable.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/00_all_0020-manual-skip-build-when-perl-is-unavailable.patch?rev=1.1&content-type=text/plain

Index: 00_all_0020-manual-skip-build-when-perl-is-unavailable.patch
===================================================================
>From 0acbb93ebb8cf2a646cc2b685cd13b22d52f1e27 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <[email protected]>
Date: Wed, 22 Feb 2006 21:12:28 -0500
Subject: [PATCH] manual: skip build when perl is unavailable

Do not try to generate the manual when perl is unavailable.  This
matches the behavior when makeinfo is unavailable.  Otherwise the
install step fails when trying to generate the libm section since
it runs a perl script.

(cherry picked from commit 1695cdae065fa3693e7b18169a100f53444eac69)
---
 manual/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manual/Makefile b/manual/Makefile
index 5382208..cdb6763 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -172,6 +172,8 @@ include ../Rules
 
 .PHONY: install subdir_install install-data
 install-data subdir_install: install
+# libm-err.texi generation requires perl.
+ifneq ($(PERL),no)
 ifneq ($(strip $(MAKEINFO)),:)
 install: $(inst_infodir)/libc.info
        @if $(SHELL) -c '$(INSTALL_INFO) --version' >/dev/null 2>&1; then \
@@ -179,6 +181,7 @@ install: $(inst_infodir)/libc.info
         $(INSTALL_INFO) --info-dir=$(inst_infodir) $(inst_infodir)/libc.info;\
        else : ; fi
 endif
+endif
 # Catchall implicit rule for other installation targets from the parent.
 install-%: ;
 
-- 
2.4.4





Reply via email to