[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/05: build: Don't build man pages when cross-compiling.
|
From: |
guix-commits |
|
Subject: |
03/05: build: Don't build man pages when cross-compiling. |
|
Date: |
Thu, 23 Apr 2020 17:59:40 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 62bc3c5b04d43ccd24922e45b79fab00f7298e10
Author: Ludovic Courtès <address@hidden>
AuthorDate: Thu Apr 23 23:20:26 2020 +0200
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".
---
configure.ac | 2 ++
doc/local.mk | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 6a6a020..a44a605 100644
--- a/configure.ac
+++ b/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)]),
diff --git a/doc/local.mk b/doc/local.mk
index 0d8e958..ddda01d 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -1,6 +1,6 @@
# GNU Guix --- Functional package management for GNU
# Copyright © 2016 Eric Bavier <address@hidden>
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic
Courtès <address@hidden>
# Copyright © 2013 Andreas Enge <address@hidden>
# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <address@hidden>
# Copyright © 2016, 2018 Mathieu Lirzin <address@hidden>
@@ -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