[h5py] 04/09: Update patch queue: - Drop 0002-prevent-cython-dep.patch, no longer required. - Drop drop-mpiposix.patch, unused. - Refresh Disable-usage-of-rpath.patch.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Feb 2 16:39:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/sid
in repository h5py.
commit 24a795ed1e5bc05fde76fbf7f2301419b8363fe7
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Tue Feb 2 10:51:54 2016 +0000
Update patch queue:
- Drop 0002-prevent-cython-dep.patch, no longer required.
- Drop drop-mpiposix.patch, unused.
- Refresh Disable-usage-of-rpath.patch.
---
debian/patches/0001-prevent-rpath.patch | 19 -----
debian/patches/0002-prevent-cython-dep.patch | 19 -----
debian/patches/Disable-usage-of-rpath.patch | 23 ++++++
debian/patches/drop-mpiposix.patch | 112 ---------------------------
debian/patches/series | 4 +-
5 files changed, 24 insertions(+), 153 deletions(-)
diff --git a/debian/patches/0001-prevent-rpath.patch b/debian/patches/0001-prevent-rpath.patch
deleted file mode 100644
index 9adc080..0000000
--- a/debian/patches/0001-prevent-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Prevent use of rpath for extension modules
-Forwarded: not-needed
-Origin: vendor
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Last-Update: 2015-04-14
-
---- h5py.orig/setup_build.py
-+++ h5py/setup_build.py
-@@ -95,8 +95,8 @@
- settings['library_dirs'].insert(0, op.join(config.hdf5, 'lib'))
-
- # TODO: should this only be done on UNIX?
-- if os.name != 'nt':
-- settings['runtime_library_dirs'] = settings['library_dirs']
-+ #if os.name != 'nt':
-+ # settings['runtime_library_dirs'] = settings['library_dirs']
-
- def make_extension(module):
- sources = [localpath('h5py', module+'.pyx')] + EXTRA_SRC.get(module, [])
diff --git a/debian/patches/0002-prevent-cython-dep.patch b/debian/patches/0002-prevent-cython-dep.patch
deleted file mode 100644
index 2abe410..0000000
--- a/debian/patches/0002-prevent-cython-dep.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Prevent install dependency on Cython
-Forwarded: not-needed
-Origin: vendor
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Last-Update: 2015-04-14
-
---- h5py.orig/setup.py
-+++ h5py/setup.py
-@@ -134,8 +134,8 @@
- packages = ['h5py', 'h5py._hl', 'h5py.tests', 'h5py.tests.old', 'h5py.tests.hl'],
- package_data = package_data,
- ext_modules = [Extension('h5py.x',['x.c'])], # To trick build into running build_ext
-- requires = ['numpy (>=1.6.1)', 'Cython (>=0.17)'],
-- install_requires = ['numpy>=1.6.1', 'Cython>=0.17', 'six'],
-+ requires = ['numpy (>=1.6.1)'],
-+ install_requires = ['numpy>=1.6.1', 'six'],
- setup_requires = ['pkgconfig', 'six'],
- cmdclass = CMDCLASS,
- )
diff --git a/debian/patches/Disable-usage-of-rpath.patch b/debian/patches/Disable-usage-of-rpath.patch
new file mode 100644
index 0000000..9e3eeb9
--- /dev/null
+++ b/debian/patches/Disable-usage-of-rpath.patch
@@ -0,0 +1,23 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 2 Feb 2016 10:56:16 +0000
+Subject: Disable usage of rpath.
+
+---
+ setup_build.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup_build.py b/setup_build.py
+index 6e3468b..05b14a5 100644
+--- a/setup_build.py
++++ b/setup_build.py
+@@ -102,8 +102,8 @@ class h5py_build_ext(build_ext):
+ settings['library_dirs'].insert(0, op.join(config.hdf5, 'lib'))
+
+ # TODO: should this only be done on UNIX?
+- if os.name != 'nt':
+- settings['runtime_library_dirs'] = settings['library_dirs']
++ #if os.name != 'nt':
++ #settings['runtime_library_dirs'] = settings['library_dirs']
+
+ def make_extension(module):
+ sources = [localpath('h5py', module+'.pyx')] + EXTRA_SRC.get(module, [])
diff --git a/debian/patches/drop-mpiposix.patch b/debian/patches/drop-mpiposix.patch
deleted file mode 100644
index 3033390..0000000
--- a/debian/patches/drop-mpiposix.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Index: h5py-2.2.1/h5py/h5fd.pyx
-===================================================================
---- h5py-2.2.1.orig/h5py/h5fd.pyx
-+++ h5py-2.2.1/h5py/h5fd.pyx
-@@ -31,7 +31,6 @@ CORE = H5FD_CORE
- FAMILY = H5FD_FAMILY
- LOG = H5FD_LOG
- MPIO = H5FD_MPIO
--MPIPOSIX = H5FD_MPIPOSIX
- MULTI = H5FD_MULTI
- SEC2 = H5FD_SEC2
- STDIO = H5FD_STDIO
-Index: h5py-2.2.1/h5py/_hl/files.py
-===================================================================
---- h5py-2.2.1.orig/h5py/_hl/files.py
-+++ h5py-2.2.1/h5py/_hl/files.py
-@@ -130,8 +130,7 @@ class File(Group):
- """Low-level HDF5 file driver used to open file"""
- drivers = {h5fd.SEC2: 'sec2', h5fd.STDIO: 'stdio',
- h5fd.CORE: 'core', h5fd.FAMILY: 'family',
-- h5fd.WINDOWS: 'windows', h5fd.MPIO: 'mpio',
-- h5fd.MPIPOSIX: 'mpiposix'}
-+ h5fd.WINDOWS: 'windows', h5fd.MPIO: 'mpio'}
- return drivers.get(self.fid.get_access_plist().get_driver(), 'unknown')
-
- @property
-Index: h5py-2.2.1/h5py/h5fd.pxd
-===================================================================
---- h5py-2.2.1.orig/h5py/h5fd.pxd
-+++ h5py-2.2.1/h5py/h5fd.pxd
-@@ -33,7 +33,6 @@ cdef extern from "hdf5.h":
- # hid_t H5FD_GASS not in 1.8.X
- hid_t H5FD_LOG
- hid_t H5FD_MPIO
-- hid_t H5FD_MPIPOSIX
- hid_t H5FD_MULTI
- hid_t H5FD_SEC2
- hid_t H5FD_STDIO
-Index: h5py-2.2.1/h5py/h5fd.c
-===================================================================
---- h5py-2.2.1.orig/h5py/h5fd.c
-+++ h5py-2.2.1/h5py/h5fd.c
-@@ -474,7 +474,6 @@ static char __pyx_k__LOG_ALL[] = "LOG_AL
- static char __pyx_k__WINDOWS[] = "WINDOWS";
- static char __pyx_k__MEM_DRAW[] = "MEM_DRAW";
- static char __pyx_k__MEM_OHDR[] = "MEM_OHDR";
--static char __pyx_k__MPIPOSIX[] = "MPIPOSIX";
- static char __pyx_k____main__[] = "__main__";
- static char __pyx_k____test__[] = "__test__";
- static char __pyx_k__LOG_ALLOC[] = "LOG_ALLOC";
-@@ -534,7 +533,6 @@ static PyObject *__pyx_n_s__MEM_NTYPES;
- static PyObject *__pyx_n_s__MEM_OHDR;
- static PyObject *__pyx_n_s__MEM_SUPER;
- static PyObject *__pyx_n_s__MPIO;
--static PyObject *__pyx_n_s__MPIPOSIX;
- static PyObject *__pyx_n_s__MULTI;
- static PyObject *__pyx_n_s__SEC2;
- static PyObject *__pyx_n_s__STDIO;
-@@ -598,7 +596,6 @@ static __Pyx_StringTabEntry __pyx_string
- {&__pyx_n_s__MEM_OHDR, __pyx_k__MEM_OHDR, sizeof(__pyx_k__MEM_OHDR), 0, 0, 1, 1},
- {&__pyx_n_s__MEM_SUPER, __pyx_k__MEM_SUPER, sizeof(__pyx_k__MEM_SUPER), 0, 0, 1, 1},
- {&__pyx_n_s__MPIO, __pyx_k__MPIO, sizeof(__pyx_k__MPIO), 0, 0, 1, 1},
-- {&__pyx_n_s__MPIPOSIX, __pyx_k__MPIPOSIX, sizeof(__pyx_k__MPIPOSIX), 0, 0, 1, 1},
- {&__pyx_n_s__MULTI, __pyx_k__MULTI, sizeof(__pyx_k__MULTI), 0, 0, 1, 1},
- {&__pyx_n_s__SEC2, __pyx_k__SEC2, sizeof(__pyx_k__SEC2), 0, 0, 1, 1},
- {&__pyx_n_s__STDIO, __pyx_k__STDIO, sizeof(__pyx_k__STDIO), 0, 0, 1, 1},
-@@ -828,7 +825,6 @@ PyMODINIT_FUNC PyInit_h5fd(void)
- * FAMILY = H5FD_FAMILY
- * LOG = H5FD_LOG # <<<<<<<<<<<<<<
- * MPIO = H5FD_MPIO
-- * MPIPOSIX = H5FD_MPIPOSIX
- */
- __pyx_t_1 = __Pyx_PyInt_to_py_hid_t(H5FD_LOG); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
-@@ -839,7 +835,6 @@ PyMODINIT_FUNC PyInit_h5fd(void)
- * FAMILY = H5FD_FAMILY
- * LOG = H5FD_LOG
- * MPIO = H5FD_MPIO # <<<<<<<<<<<<<<
-- * MPIPOSIX = H5FD_MPIPOSIX
- * MULTI = H5FD_MULTI
- */
- __pyx_t_1 = __Pyx_PyInt_to_py_hid_t(H5FD_MPIO); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-@@ -847,21 +842,8 @@ PyMODINIT_FUNC PyInit_h5fd(void)
- if (PyObject_SetAttr(__pyx_m, __pyx_n_s__MPIO, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-
-- /* "h5py/h5fd.pyx":34
-- * LOG = H5FD_LOG
-- * MPIO = H5FD_MPIO
-- * MPIPOSIX = H5FD_MPIPOSIX # <<<<<<<<<<<<<<
-- * MULTI = H5FD_MULTI
-- * SEC2 = H5FD_SEC2
-- */
-- __pyx_t_1 = __Pyx_PyInt_to_py_hid_t(H5FD_MPIPOSIX); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-- __Pyx_GOTREF(__pyx_t_1);
-- if (PyObject_SetAttr(__pyx_m, __pyx_n_s__MPIPOSIX, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
--
- /* "h5py/h5fd.pyx":35
- * MPIO = H5FD_MPIO
-- * MPIPOSIX = H5FD_MPIPOSIX
- * MULTI = H5FD_MULTI # <<<<<<<<<<<<<<
- * SEC2 = H5FD_SEC2
- * STDIO = H5FD_STDIO
-@@ -872,7 +854,6 @@ PyMODINIT_FUNC PyInit_h5fd(void)
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-
- /* "h5py/h5fd.pyx":36
-- * MPIPOSIX = H5FD_MPIPOSIX
- * MULTI = H5FD_MULTI
- * SEC2 = H5FD_SEC2 # <<<<<<<<<<<<<<
- * STDIO = H5FD_STDIO
diff --git a/debian/patches/series b/debian/patches/series
index 3fdb31b..9233bdb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-#drop-mpiposix.patch
-0001-prevent-rpath.patch
-0002-prevent-cython-dep.patch
+Disable-usage-of-rpath.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git
More information about the debian-science-commits
mailing list