Преглед изворни кода

build: Don't build man pages when cross-compiling.

* configure.ac: Define 'CROSS_COMPILING' Automake conditional.
* doc/local.mk (dist_man1_MANS): Wrap in "if !CROSS_COMPILING".
gn-latest-20200428
Ludovic Courtès пре 5 месеци
родитељ
комит
62bc3c5b04
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
2 измењених фајлова са 10 додато и 1 уклоњено
  1. +2
    -0
      configure.ac
  2. +8
    -1
      doc/local.mk

+ 2
- 0
configure.ac Прегледај датотеку

@@ -26,6 +26,8 @@ AM_GNU_GETTEXT_VERSION([0.18.1])
GUIX_SYSTEM_TYPE
GUIX_ASSERT_SUPPORTED_SYSTEM

AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])

AC_ARG_WITH(store-dir,
AC_HELP_STRING([--with-store-dir=PATH],
[file name of the store (defaults to /gnu/store)]),


+ 8
- 1
doc/local.mk Прегледај датотеку

@@ -1,6 +1,6 @@
# GNU Guix --- Functional package management for GNU
# Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
@@ -202,10 +202,15 @@ sub_commands_mans = \
$(srcdir)/%D%/guix-time-machine.1 \
$(srcdir)/%D%/guix-weather.1

# Assume that cross-compiled commands cannot be executed.
if !CROSS_COMPILING

dist_man1_MANS = \
$(srcdir)/%D%/guix.1 \
$(sub_commands_mans)

endif

gen_man = \
LANGUAGE= $(top_builddir)/pre-inst-env $(HELP2MAN) \
$(HELP2MANFLAGS)
@@ -227,6 +232,7 @@ $(srcdir)/%D%/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
esac

if BUILD_DAEMON
if !CROSS_COMPILING

dist_man1_MANS += $(srcdir)/%D%/guix-daemon.1

@@ -234,3 +240,4 @@ $(srcdir)/%D%/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
-$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`

endif
endif

Loading…
Откажи
Сачувај