[med-svn] [Git][med-team/mash][master] 4 commits: Demote python3-sphix and libjs-mathjax to B-D-I: helps fix cross-satisfiablity

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / mash


Commits:
8d3c9c84 by Nilesh Patra at 2021-03-11T11:55:32+05:30
Demote python3-sphix and libjs-mathjax to B-D-I: helps fix cross-satisfiablity

- - - - -
e9759d8c by Nilesh Patra at 2021-03-11T11:56:09+05:30
Build docs only for the -doc package

- - - - -
55c5ce27 by Nilesh Patra at 2021-03-11T12:02:21+05:30
d/p/use-CXX-from-configure.patch: Fix cross buildability

- - - - -
2a807371 by Nilesh Patra at 2021-03-11T12:04:46+05:30
Interim changelog

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/use-CXX-from-configure.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+mash (2.2.2+dfsg-3) UNRELEASED; urgency=medium
+
+  * Demote python3-sphix and libjs-mathjax to B-D-I
+     - Helps fix cross-satisfiablity
+  * Build docs only for the -doc package
+  * d/p/use-CXX-from-configure.patch
+     - Fix cross buildability
+
+ -- Nilesh Patra <nilesh at debian.org>  Thu, 11 Mar 2021 12:02:30 +0530
+
 mash (2.2.2+dfsg-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -8,10 +8,12 @@ Build-Depends: debhelper (>= 12~),
                libcapnp-dev (>= 0.6.1),
                libgsl-dev,
                zlib1g-dev,
-               python3-sphinx,
-               libjs-mathjax,
                asciidoctor,
-               libmurmurhash-dev
+               libmurmurhash-dev,
+               pkg-config
+Build-Depends-Indep: python3-sphinx,
+                     libjs-mathjax,
+                     dh-sequence-sphinxdoc
 Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/med-team/mash
 Vcs-Git: https://salsa.debian.org/med-team/mash.git


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ drop_memcpy_wrapper.patch
 link_dynamically_against_capnp.patch
 parallel.patch
 use_debian_packaged_libmurmurhash.patch
+use-CXX-from-configure.patch


=====================================
debian/patches/use-CXX-from-configure.patch
=====================================
@@ -0,0 +1,38 @@
+Description: Pass @CXX@ into Makefile.in for fixing cross-satsfiablity problem
+             Do not use "uname -s" in Makefile.in -- this is bad for cross builds. Rather propagate the variable in configure.ac
+Author: Nilesh Patra <nilesh at debian.org>
+Last-Update: 2021-03-11
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,12 +1,7 @@
+-CXXFLAGS += -O3 -std=c++14 -Isrc -I at capnp@/include -I at mathinc@
++CXX = @CXX@
++CXXFLAGS += -O3 -std=c++14 -Isrc -I at capnp@/include -I at mathinc@ @DARWIN_CXXFLAGS@
+ CPPFLAGS += @amcppflags@
+ 
+-UNAME_S=$(shell uname -s)
+-
+-ifeq ($(UNAME_S),Darwin)
+-	CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++
+-endif
+-
+ SOURCES=\
+ 	src/mash/Command.cpp \
+ 	src/mash/CommandBounds.cpp \
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,4 +76,14 @@
+ 
+ AC_SUBST(capnp, $with_capnp)
+ 
++case ${host} in
++        *-*-darwin*)
++                DARWIN_CXXFLAGS="-mmacosx-version-min=10.7 -stdlib=libc++"
++        ;;
++        *)
++                DARWIN_CXXFLAGS=""
++        ;;
++esac
++AC_SUBST(DARWIN_CXXFLAGS)
++
+ AC_OUTPUT(Makefile)


=====================================
debian/rules
=====================================
@@ -11,7 +11,7 @@ endif
 export DEB_CPPFLAGS_MAINT_APPEND
 
 %:
-	dh $@ --with sphinxdoc
+	dh $@
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -20,8 +20,7 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	dh_auto_configure --  --with-capnp=/usr --with-gsl=/usr --prefix=$(CURDIR)/debian/tmp/usr
 
-override_dh_auto_build:
-	dh_auto_build
+execute_after_dh_auto_build-indep:
 	sphinx-build doc/sphinx $(CURDIR)/debian/sphinxdoc
 
 override_dh_installman:



View it on GitLab: https://salsa.debian.org/med-team/mash/-/compare/7ab61c2698883f47d89bebe3961185d5e5426137...2a8073717a86e087c755d5eb21dd7680015f8af0

-- 
View it on GitLab: https://salsa.debian.org/med-team/mash/-/compare/7ab61c2698883f47d89bebe3961185d5e5426137...2a8073717a86e087c755d5eb21dd7680015f8af0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210311/04195678/attachment-0001.htm>