Michael R. Crusoe pushed to branch master at Debian Med / obitools
Commits: d16083e3 by Michael R. Crusoe at 2024-11-20T21:09:41+01:00 fix non-root build - - - - - b24d103b by Michael R. Crusoe at 2024-11-20T21:17:01+01:00 d/control: new homepage - - - - - 3 changed files: - debian/changelog - debian/control - debian/patches/cmake_debian_options Changes: ===================================== debian/changelog ===================================== @@ -7,6 +7,7 @@ obitools (3.0.1~b26+dfsg-1) unstable; urgency=medium * d/control: needs cmake * d/control: switch to Cython 3.x * Added patch to enable building on any architecture. + * d/control: new homepage -- Michael R. Crusoe <[email protected]> Wed, 20 Nov 2024 19:00:04 +0100 ===================================== debian/control ===================================== @@ -16,7 +16,7 @@ Build-Depends: debhelper-compat (= 13), Standards-Version: 4.7.0 Vcs-Browser: https://salsa.debian.org/med-team/obitools Vcs-Git: https://salsa.debian.org/med-team/obitools.git -Homepage: https://pypi.python.org/pypi/OBITools +Homepage: https://metabarcoding.org/obitools3 Rules-Requires-Root: no Package: obitools ===================================== debian/patches/cmake_debian_options ===================================== @@ -1,11 +1,23 @@ --- obitools.orig/setup.py +++ obitools/setup.py -@@ -60,7 +60,7 @@ +@@ -58,9 +58,9 @@ + + oldwd = os.getcwd() os.chdir("build/cobject") - install_clibdir_option="-DPYTHONLIB:STRING='%s'" % self.clib_dir +- install_clibdir_option="-DPYTHONLIB:STRING='%s'" % self.clib_dir ++ install_clibdir_option="-DPYTHONLIB:STRING='%s'" % oldwd log.info("Run CMake") - subprocess.call(['cmake', install_clibdir_option, '../../src']) + subprocess.call(['cmake', install_clibdir_option, "-DCMAKE_BUILD_TYPE=None", "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON", "-DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF", "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON", "-DFETCHCONTENT_FULLY_DISCONNECTED=ON", "-GUnix Makefiles", "-DCMAKE_VERBOSE_MAKEFILE=ON", '../../src']) log.info("Compile the shared C library") subprocess.call(['make','install']) # temporary fix but should be in src os.chdir(oldwd) +@@ -134,7 +134,7 @@ + '-fPIC' + ], + extra_link_args=["-Wl,-rpath,"+get_python_lib(), +- "-L"+get_python_lib() ++ "-L"+os.getcwd() + ] + ) + for x in cython_src View it on GitLab: https://salsa.debian.org/med-team/obitools/-/compare/e86c15174b4088809a4c6e854a8ae8610b5f5cde...b24d103b9a8321b3b2688d13363127228477eb5f -- View it on GitLab: https://salsa.debian.org/med-team/obitools/-/compare/e86c15174b4088809a4c6e854a8ae8610b5f5cde...b24d103b9a8321b3b2688d13363127228477eb5f 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
