[med-svn] [Git][med-team/jellyfish][master] 3 commits: Improve cross-compiling

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch master at Debian Med / jellyfish


Commits:
959c556d by Michael R. Crusoe at 2024-12-11T13:14:10+01:00
Improve cross-compiling

- - - - -
cf55f063 by Michael R. Crusoe at 2024-12-11T13:19:43+01:00
fix arch build

- - - - -
7f405318 by Michael R. Crusoe at 2024-12-11T13:34:49+01:00
undo split

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,6 @@
 jellyfish (2.3.1-5) UNRELEASED; urgency=medium
 
-  * Simplify architecture independent build.
+  * Improve cross-compiling
 
  -- Michael R. Crusoe <crusoe at debian.org>  Wed, 11 Dec 2024 12:33:32 +0100
 


=====================================
debian/control
=====================================
@@ -9,22 +9,23 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                architecture-is-little-endian,
                architecture-is-64-bit,
+               d-shlibs,
                autoconf-archive,
-               libhts-dev
-Build-Depends-Arch: d-shlibs,
-                    yaggo,
-                    pkgconf,
-                    bc,
-                    time,
-                    procps,
-                    swig,
-                    python3-all-dev,
-                    dh-sequence-python3,
-                    python3-setuptools,
-                    perl,
-                    chrpath,
-                    dos2unix,
-                    samtools
+               yaggo,
+               pkgconf,
+               bc,
+               time,
+               procps,
+               swig,
+               python3-all-dev:native,
+               libpython3-all-dev,
+               dh-sequence-python3,
+               python3-setuptools,
+               perl,
+               chrpath,
+               libhts-dev,
+               dos2unix,
+               samtools
 Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/med-team/jellyfish
 Vcs-Git: https://salsa.debian.org/med-team/jellyfish.git


=====================================
debian/rules
=====================================
@@ -2,6 +2,8 @@
 
 include /usr/share/dpkg/default.mk
 
+build3vers := $(shell py3versions -sv)
+
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 export DH_OPTIONS
@@ -30,10 +32,7 @@ override_dh_update_autotools_config:
 	mv m4/m4-ax_python_devel.m4 /tmp
 	dh_update_autotools_config
 
-override_dh_auto_build-indep:
-	echo "No building needed for the examples package"
-
-override_dh_auto_install-arch:
+override_dh_auto_install:
 	chrpath --delete bin/.libs/*
 	dh_auto_install -- install-data
 	dh_auto_install --sourcedirectory=swig/python --buildsystem=pybuild
@@ -53,10 +52,7 @@ override_dh_auto_install-arch:
 	sed -i "/dependency_libs/ s/'.*'/''/" ./debian/libjellyfish-2.0-dev/usr/lib/${DEB_HOST_MULTIARCH}/*.la
 	chrpath --delete debian/*/usr/lib/python*/dist-packages/_dna_jellyfish*.so
 
-override_dh_auto_install-indep:
-	echo "Examples package doesn't need 'make install'"
-
-override_dh_auto_configure-arch:
+override_dh_auto_configure:
 	dh_auto_configure -- --enable-swig --enable-perl-binding --enable-htslib --enable-python-binding PYTHON=/usr/bin/python3
 	dh_auto_configure --sourcedirectory=swig/perl5
 	dh_auto_configure --sourcedirectory=swig/python --buildsystem=pybuild
@@ -68,7 +64,7 @@ execute_after_dh_clean:
 	    rmdir debian/tmp_save_tests ; \
 	fi
 
-override_dh_auto_build-arch:
+override_dh_auto_build:
 	mkdir -p debian/tmp_save_tests
 	cp -a tests/* debian/tmp_save_tests
 	dh_auto_build --no-parallel -- all bin/generate_sequence bin/test_all bin/fastq2sam
@@ -81,10 +77,10 @@ override_dh_auto_build-arch:
 # jellyfish contains a *really* big test which should *not* run on autobuilders
 # if you have a *really* large machine you can try to activate this test by
 # uncommenting the following.
-#override_dh_auto_test-arch:
+#override_dh_auto_test:
 #	BIG=1 dh_auto_test
 #	false
-override_dh_auto_test-arch:
+override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 ifeq ($(DEB_HOST_ARCH_BITS),32)
 	echo "Test data are to big for 32bit architectures thus no testing is done"
@@ -98,17 +94,14 @@ else
 endif
 endif
 
-override_dh_auto_test-indep:
-	echo "No testing needed for the examples package"
-
-override_dh_missing-arch:
+override_dh_missing:
 	# Python files are just installed
 	rm -rf debian/tmp/usr/lib/python3/dist-packages
 	# Necessary Perl files are just installed
 	rm -rf debian/tmp/usr/lib/perl/5.*
 	dh_missing
 
-execute_after_dh_install-arch:
+execute_after_dh_install:
 	# Fix PACKAGE_NAME defined in config.h colliding with potential reverse
 	# dependencies autotools invocations, per lintian warning.
 	rm -vf debian/libjellyfish-2.0-dev/usr/include/jellyfish/config.h



View it on GitLab: https://salsa.debian.org/med-team/jellyfish/-/compare/84f1392a7c722a970619683e3cbafd30fd2adf8b...7f405318992e1cdee80b2026a070c935093c2e55

-- 
View it on GitLab: https://salsa.debian.org/med-team/jellyfish/-/compare/84f1392a7c722a970619683e3cbafd30fd2adf8b...7f405318992e1cdee80b2026a070c935093c2e55
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/20241211/bf176bde/attachment-0001.htm>