Michael R. Crusoe pushed to branch master at Debian Med / jellyfish
Commits: 84f1392a by Michael R. Crusoe at 2024-12-11T12:47:44+01:00 Simplify architecture independent build. - - - - - 3 changed files: - debian/changelog - debian/control - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +jellyfish (2.3.1-5) UNRELEASED; urgency=medium + + * Simplify architecture independent build. + + -- Michael R. Crusoe <[email protected]> Wed, 11 Dec 2024 12:33:32 +0100 + jellyfish (2.3.1-4) unstable; urgency=medium [ Michael R. Crusoe ] ===================================== debian/control ===================================== @@ -9,22 +9,22 @@ Priority: optional Build-Depends: debhelper-compat (= 13), architecture-is-little-endian, architecture-is-64-bit, - d-shlibs, autoconf-archive, - yaggo, - pkgconf, - bc, - time, - procps, - swig, - python3-all-dev, - dh-sequence-python3, - python3-setuptools, - perl, - chrpath, - libhts-dev, - dos2unix, - samtools + 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 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,8 +2,6 @@ include /usr/share/dpkg/default.mk -build3vers := $(shell py3versions -sv) - export DEB_BUILD_MAINT_OPTIONS=hardening=+all export DH_OPTIONS @@ -32,7 +30,10 @@ override_dh_update_autotools_config: mv m4/m4-ax_python_devel.m4 /tmp dh_update_autotools_config -override_dh_auto_install: +override_dh_auto_build-indep: + echo "No building needed for the examples package" + +override_dh_auto_install-arch: chrpath --delete bin/.libs/* dh_auto_install -- install-data dh_auto_install --sourcedirectory=swig/python --buildsystem=pybuild @@ -52,7 +53,10 @@ override_dh_auto_install: 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_configure: +override_dh_auto_install-indep: + echo "Examples package doesn't need 'make install'" + +override_dh_auto_configure-arch: 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 @@ -64,7 +68,7 @@ execute_after_dh_clean: rmdir debian/tmp_save_tests ; \ fi -override_dh_auto_build: +override_dh_auto_build-arch: 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 @@ -77,10 +81,10 @@ override_dh_auto_build: # 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: +#override_dh_auto_test-arch: # BIG=1 dh_auto_test # false -override_dh_auto_test: +override_dh_auto_test-arch: 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" @@ -94,14 +98,17 @@ else endif endif -override_dh_missing: +override_dh_auto_test-indep: + echo "No testing needed for the examples package" + +override_dh_missing-arch: # 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: +execute_after_dh_install-arch: # 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/-/commit/84f1392a7c722a970619683e3cbafd30fd2adf8b -- View it on GitLab: https://salsa.debian.org/med-team/jellyfish/-/commit/84f1392a7c722a970619683e3cbafd30fd2adf8b You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
