Bas Couwenberg pushed to branch master at Debian GIS Project / netcdf4-python
Commits: 90bd4aab by Bas Couwenberg at 2022-12-01T20:22:46+01:00 Use path to not set RPATH in libraries. - - - - - 5 changed files: - debian/changelog - debian/control - + debian/patches/rpath.patch - + debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,6 +1,7 @@ netcdf4-python (1.6.2-2) UNRELEASED; urgency=medium * Add Rules-Requires-Root to control file. + * Use path to not set RPATH in libraries. -- Bas Couwenberg <[email protected]> Mon, 28 Nov 2022 14:23:50 +0100 ===================================== debian/control ===================================== @@ -13,8 +13,7 @@ Build-Depends: debhelper-compat (= 12), cython3, libhdf5-dev, libnetcdf-dev (>= 1:4.4.0), - netcdf-bin, - chrpath + netcdf-bin Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/debian-gis-team/netcdf4-python/ Vcs-Git: https://salsa.debian.org/debian-gis-team/netcdf4-python.git ===================================== debian/patches/rpath.patch ===================================== @@ -0,0 +1,28 @@ +Description: Don't set RPATH in libraries. +Author: Bas Couwenberg <[email protected]> +Forwarded: not-needed + +--- a/setup.py ++++ b/setup.py +@@ -520,11 +520,6 @@ NETCDF4_DIR environment variable not set + lib_dirs.append(curl_libdir) + inc_dirs.append(curl_incdir) + +-if sys.platform == 'win32': +- runtime_lib_dirs = [] +-else: +- runtime_lib_dirs = lib_dirs +- + # Do not require numpy for just querying the package + # Taken from the h5py setup file. + if any('--' + opt in sys.argv for opt in Distribution.display_option_names + +@@ -696,8 +691,7 @@ if 'sdist' not in sys.argv[1:] and 'clea + define_macros=DEFINE_MACROS, + libraries=libs, + library_dirs=lib_dirs, +- include_dirs=inc_dirs + ['include'], +- runtime_library_dirs=runtime_lib_dirs)] ++ include_dirs=inc_dirs + ['include'])] + # set language_level directive to 3 + for e in ext_modules: + e.cython_directives = {'language_level': "3"} # ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +rpath.patch ===================================== debian/rules ===================================== @@ -21,12 +21,6 @@ override_dh_auto_test: PYBUILD_SYSTEM=custom \ PYBUILD_TEST_ARGS="cd test && NO_NET=1 NO_PLUGINS=1 {interpreter} run_all.py" dh_auto_test || echo "Ignoring test failures" -override_dh_auto_install: - dh_auto_install - - # removing embedded rpath in libraries - -find $(CURDIR)/debian/*/usr/lib -name "*.so*" -type f -exec chrpath --delete {} \; - override_dh_python3: dh_python3 -ppython3-netcdf4 dh_numpy3 -ppython3-netcdf4 View it on GitLab: https://salsa.debian.org/debian-gis-team/netcdf4-python/-/commit/90bd4aab819eef0d873914a3156999e5d219237d -- View it on GitLab: https://salsa.debian.org/debian-gis-team/netcdf4-python/-/commit/90bd4aab819eef0d873914a3156999e5d219237d You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
