bootstrap version without docs for Modularity

This commit is contained in:
Karsten Hopp 2017-04-20 11:57:19 +02:00
parent a18bf3932e
commit 761f060d1f
2 changed files with 53 additions and 1 deletions

39
libtool-nodocs.patch Normal file
View File

@ -0,0 +1,39 @@
--- Makefile.in.nodocs 2017-04-19 16:15:58.630583989 +0200
+++ Makefile.in 2017-04-19 16:18:19.055635521 +0200
@@ -313,12 +313,11 @@
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
DVIPS = dvips
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
- install-exec-recursive install-html-recursive \
- install-info-recursive install-pdf-recursive \
- install-ps-recursive install-recursive installcheck-recursive \
- installdirs-recursive pdf-recursive ps-recursive \
+ ctags-recursive \
+ install-data-recursive \
+ install-exec-recursive \
+ install-recursive installcheck-recursive \
+ installdirs-recursive \
tags-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
@@ -361,8 +360,7 @@
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
-am__DIST_COMMON = $(dist_man1_MANS) $(doc_libtool_TEXINFOS) \
- $(srcdir)/Makefile.in $(srcdir)/config-h.in \
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config-h.in \
$(srcdir)/libltdl/ltdl.mk $(top_srcdir)/build-aux/compile \
$(top_srcdir)/build-aux/config.guess \
$(top_srcdir)/build-aux/config.sub \
@@ -1973,7 +1971,7 @@
info-am: $(INFO_DEPS)
install-data-am: install-data-local install-includeHEADERS \
- install-info-am install-ltdlincludeHEADERS install-man
+ install-ltdlincludeHEADERS
install-dvi: install-dvi-recursive

View File

@ -1,6 +1,10 @@
# See the bug #1289759 # See the bug #1289759
%undefine _hardened_build %undefine _hardened_build
# Set to bcond_without or use --with bootstrap if bootstrapping a new release
# or architecture
%bcond_without bootstrap
# See the bug #429880 # See the bug #429880
%global gcc_major %(gcc -dumpversion || echo "666") %global gcc_major %(gcc -dumpversion || echo "666")
@ -19,6 +23,9 @@ Source: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
# ~> downstream # ~> downstream
# ~> remove possibly once #1158915 gets fixed somehow # ~> remove possibly once #1158915 gets fixed somehow
Patch0: libtool-2.4.5-rpath.patch Patch0: libtool-2.4.5-rpath.patch
%if %{without bootstrap}
Patch100: libtool-nodocs.patch
%endif
# /usr/bin/libtool includes paths within gcc's versioned directories # /usr/bin/libtool includes paths within gcc's versioned directories
# Libtool must be rebuilt whenever a new upstream gcc is built # Libtool must be rebuilt whenever a new upstream gcc is built
@ -29,7 +36,10 @@ Requires: autoconf, automake, sed, tar, findutils
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
BuildRequires: autoconf, automake, texinfo %if %{without bootstrap}
BuildRequires: texinfo
%endif
BuildRequires: autoconf, automake
BuildRequires: help2man BuildRequires: help2man
# make sure we can configure all supported langs # make sure we can configure all supported langs
@ -85,6 +95,9 @@ Static libraries and header files for development with ltdl.
%prep %prep
%setup -n libtool-%{version} -q %setup -n libtool-%{version} -q
%patch0 -p1 -b .rpath %patch0 -p1 -b .rpath
%if %{without bootstrap}
%patch100 -p1 -b .nodocs
%endif
autoreconf -v autoreconf -v