1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
|
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Use adios_config in place during build and install
Last-Updated: 2016-10-21
Forwarded: not-needed
Index: adios-1.13.0/Makefile.am
===================================================================
--- adios-1.13.0.orig/Makefile.am
+++ adios-1.13.0/Makefile.am
@@ -60,8 +60,6 @@ install-data-hook:
echo "GITSTAT=\"git status not available\"" >> $(abs_top_builddir)/adios_git_status; \
echo "Note: git command not found or $(PWD) is not a git repository."; \
fi)
- $(INSTALL_DATA) adios_config.flags $(DESTDIR)$(sysconfdir)
- $(INSTALL_DATA) adios_git_status $(DESTDIR)$(sysconfdir)
CLEANFILES = adios_config adios_config.flags adios_config.makesrc adios_config.flags.makesrc
Index: adios-1.13.0/wrappers/numpy/setup_mpi.py
===================================================================
--- adios-1.13.0.orig/wrappers/numpy/setup_mpi.py
+++ adios-1.13.0/wrappers/numpy/setup_mpi.py
@@ -27,8 +27,8 @@ import argparse
# sys.exit(0)
# Default option values
-include_dirs = [np.get_include(), '../../src/public'],
-library_dirs = []
+include_dirs = ['../../src/public']
+library_dirs = ['../../debian/tmp/usr/lib']
extra_compile_args = []
extra_link_args = []
Index: adios-1.13.0/wrappers/numpy/setup.py
===================================================================
--- adios-1.13.0.orig/wrappers/numpy/setup.py
+++ adios-1.13.0/wrappers/numpy/setup.py
@@ -19,7 +19,7 @@ m1 = Extension('adios.adios',
sources=['adios.cpp'],
define_macros=[('_NOMPI', None)],
include_dirs = [np.get_include(), '../../src/public'],
- library_dirs = [],
+ library_dirs = ['../../debian/tmp/usr/lib'],
libraries = [],
extra_objects = [],
extra_compile_args = ['-Wno-uninitialized',
|