Nilesh Patra pushed to branch master at Debian Med / khmer
Commits:
e6df1517 by Nilesh Patra at 2022-09-24T21:03:24+05:30
Add patch to find object files at the right location (Closes: #1020031)
- - - - -
905690ec by Nilesh Patra at 2022-09-24T21:04:35+05:30
d/rules: split oxli make rules into two, pass paramters to not over-clean for make-all call
- - - - -
584bd180 by Nilesh Patra at 2022-09-24T21:05:19+05:30
Upload to unstable
- - - - -
4 changed files:
- debian/changelog
- + debian/patches/find_object_files_at_right_loc.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+khmer (3.0.0~a3+dfsg-4) unstable; urgency=medium
+
+ * Team Upload.
+ * Add patch to find object files at the right location (Closes: #1020031)
+ * d/rules: split oxli make rules into two, pass parameters/env-vars to not
+ over-clean for make-all call
+
+ -- Nilesh Patra <nilesh at debian.org> Sat, 24 Sep 2022 21:04:43 +0530
+
khmer (3.0.0~a3+dfsg-3) unstable; urgency=medium
* debian/control: stop building on no-amd64 due to use of assembly
=====================================
debian/patches/find_object_files_at_right_loc.patch
=====================================
@@ -0,0 +1,34 @@
+Description: The location for compiler cpy binaries changed, reflect the change in setup.py
+Author: Nilesh Patra <nilesh at debian.org>
+Last-Update: 2022-09-24
+--- a/setup.py
++++ b/setup.py
+@@ -136,10 +136,19 @@
+ platform=sysconfig.get_platform(),
+ version=sys.version_info)
+
++def distutils_obj_dir_name(dname):
++ """Returns the name of a distutils build directory"""
++ f = "{dirname}.{platform}-cpython-{version[0]}{version[1]}"
++ return f.format(dirname=dname,
++ platform=sysconfig.get_platform(),
++ version=sys.version_info)
+
+ def build_dir():
+ return path_join("build", distutils_dir_name("temp"))
+
++def build_obj_dir():
++ return path_join("build", distutils_obj_dir_name("temp"))
++
+ # We bundle tested versions of zlib & bzip2. To use the system zlib and bzip2
+ # change setup.cfg or use the `--libraries z,bz2` parameter which will make our
+ # custom build_ext command strip out the bundled versions.
+@@ -208,7 +217,7 @@
+ "sources": [cython_ext, "khmer/_oxli/oxli_exception_convert.cc"],
+ "extra_compile_args": EXTRA_COMPILE_ARGS,
+ "extra_link_args": EXTRA_LINK_ARGS,
+- "extra_objects": [path_join(build_dir(), splitext(p)[0] + '.o')
++ "extra_objects": [path_join(build_obj_dir(), splitext(p)[0] + '.o')
+ for p in SOURCES],
+ "depends": [],
+ "include_dirs": ["include", "."],
=====================================
debian/patches/series
=====================================
@@ -16,3 +16,4 @@ gcc11.patch
bz2.patch
stringio-buffer.patch
refresh_cython
+find_object_files_at_right_loc.patch
=====================================
debian/rules
=====================================
@@ -20,7 +20,8 @@ override_dh_auto_build:
ln -sf `pybuild --print build_dir|awk -F: '{print $$2}'`/khmer/*.so khmer && \
./setup.py develop --user && ./setup.py build_sphinx
asciidoctor --backend manpage -a reproducible debian/khmer.1.adoc
- cd src/oxli && $(MAKE) clean all
+ $(MAKE) -C src/oxli clean
+ $(MAKE) -C src/oxli all USE_SYSTEM_ZLIB="true" USE_SYSTEM_LIBBZ2="true"
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
View it on GitLab: https://salsa.debian.org/med-team/khmer/-/compare/54a174517649db67cd2aa7285c16fee1f03a99b6...584bd18075e215723fb6bdfc9fac68ada41c412b
--
View it on GitLab: https://salsa.debian.org/med-team/khmer/-/compare/54a174517649db67cd2aa7285c16fee1f03a99b6...584bd18075e215723fb6bdfc9fac68ada41c412b
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/20220924/da910e57/attachment-0001.htm>