Source: ns3
Version: 3.30+dfsg-3.1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: cross-satisfiability
ns3 cannot satisfy its cross Build-Depends for lots of reasons. It turns
out that many of its Build-Depends are only needed for ns3-doc, which
happens to be Architecture: all. By slightly tweaking debian/rules, we
can move a good chunk of Build-Depends to Build-Depends-Indep making
them irrelevant to cross building. This does not make ns3 cross
buildable, but is a significant step in that direction. Please consider
applying the attached patch and close this bug when doing so.
Helmut
diff --minimal -Nru ns3-3.30+dfsg/debian/changelog
ns3-3.30+dfsg/debian/changelog
--- ns3-3.30+dfsg/debian/changelog 2020-01-20 00:21:22.000000000 +0100
+++ ns3-3.30+dfsg/debian/changelog 2020-01-24 16:45:47.000000000 +0100
@@ -1,3 +1,12 @@
+ns3 (3.30+dfsg-3.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Don't build documentation during arch-only.
+ * Drop support for DEB_BUILD_OPTIONS=nodoc, build indep-only instead.
+ * Demote a lot of dependencies to B-D-I. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 24 Jan 2020 16:45:47 +0100
+
ns3 (3.30+dfsg-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru ns3-3.30+dfsg/debian/control ns3-3.30+dfsg/debian/control
--- ns3-3.30+dfsg/debian/control 2020-01-20 00:21:21.000000000 +0100
+++ ns3-3.30+dfsg/debian/control 2020-01-24 16:45:47.000000000 +0100
@@ -13,19 +13,20 @@
flex,
libboost-filesystem-dev,
libboost-signals-dev,
- libgraphviz-dev,
libgsl-dev,
libopenmpi-dev [alpha amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386
powerpc sparc],
libsqlite3-dev,
libxml2-dev,
pkg-config,
python3-dev,
- quilt (>= 0.46-7~),
gir1.2-goocanvas-2.0,
python3-gi,
python3-gi-cairo,
python3-pygraphviz,
gir1.2-gtk-3.0,
+Build-Depends-Indep:
+ libgraphviz-dev,
+ quilt (>= 0.46-7~),
ipython3,
dia,
dvipng,
diff --minimal -Nru ns3-3.30+dfsg/debian/rules ns3-3.30+dfsg/debian/rules
--- ns3-3.30+dfsg/debian/rules 2019-09-16 11:18:03.000000000 +0200
+++ ns3-3.30+dfsg/debian/rules 2020-01-24 16:45:47.000000000 +0100
@@ -26,18 +26,10 @@
%:
dh $@ --with python3
-build-indep: build-doc-stamp
-
-build-doc-stamp:
-ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
+override_dh_auto_build-indep:
make html man -C ./$(NS3_DIR)/doc/manual/ SPHINXOPTS="$(SPHINXOPTS)"
make html man -C ./$(NS3_DIR)/doc/models/ SPHINXOPTS="$(SPHINXOPTS)"
make html man -C ./$(NS3_DIR)/doc/tutorial/ SPHINXOPTS="$(SPHINXOPTS)"
-else
- mkdir -p ./$(NS3_DIR)/doc/manual/build/html
- mkdir -p ./$(NS3_DIR)/doc/models/build/html
- mkdir -p ./$(NS3_DIR)/doc/tutorial/build/html
-endif
rm -f ns-3.*/doc/*/build/*/_static/jquery.js
rm -f ns-3.*/doc/*/build/*/_static/underscore.js
touch $@
@@ -48,7 +40,7 @@
--libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
-override_dh_auto_build: build-doc-stamp
+override_dh_auto_build-arch:
####### build and install shared libraries, python bindings for default
python.
cd $(NS3_DIR) ; ./waf build $(BUILD_OPTION)
