[silo-llnl] 69/96: WIP: Add compile fixes for g++ compiler
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 13:09:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository silo-llnl.
commit 2a0e5a9b4f0bd4de1ee9108932d8f7994dac2574
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu May 1 11:52:57 2014 +0100
WIP: Add compile fixes for g++ compiler
---
debian/patches/compile-fixes.patch | 47 ++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 12 ++++------
3 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/debian/patches/compile-fixes.patch b/debian/patches/compile-fixes.patch
new file mode 100644
index 0000000..3de4137
--- /dev/null
+++ b/debian/patches/compile-fixes.patch
@@ -0,0 +1,47 @@
+Index: silo-llnl-4.9.1/src/pdb/pdb.c
+===================================================================
+--- silo-llnl-4.9.1.orig/src/pdb/pdb.c 2014-04-30 23:45:29.000000000 +0100
++++ silo-llnl-4.9.1/src/pdb/pdb.c 2014-05-01 11:45:57.393325151 +0100
+@@ -1057,7 +1057,7 @@
+ if (file->virtual_internal) {
+ SC_address ad;
+
+- ad.memaddr = vr;
++ ad.memaddr = (char*) vr;
+ ep->blocks->diskaddr = ad.diskaddr;
+ lite_SC_mark(vr, 1);
+ ep = lite_PD_copy_syment(ep);
+Index: silo-llnl-4.9.1/src/pdb/pdlow.c
+===================================================================
+--- silo-llnl-4.9.1.orig/src/pdb/pdlow.c 2014-04-30 23:45:29.000000000 +0100
++++ silo-llnl-4.9.1/src/pdb/pdlow.c 2014-05-01 11:48:42.905240006 +0100
+@@ -1757,13 +1757,13 @@
+ _lite_PD_eod (PDBfile *file) {
+
+ FILE *fp;
+- long old, new;
++ long old, nw;
+
+ fp = file->stream;
+ old = file->chrtaddr;
+- new = io_tell(fp);
++ nw = io_tell(fp);
+
+- file->chrtaddr = MAX(old, new);
++ file->chrtaddr = MAX(old, nw);
+ }
+ #endif /* PDB_WRITE */
+
+Index: silo-llnl-4.9.1/src/pdb/pdrdwr.c
+===================================================================
+--- silo-llnl-4.9.1.orig/src/pdb/pdrdwr.c 2014-04-30 23:45:29.000000000 +0100
++++ silo-llnl-4.9.1/src/pdb/pdrdwr.c 2014-05-01 11:49:08.681823186 +0100
+@@ -1727,7 +1727,7 @@
+ PD_WRITE);
+ }
+ vbuf = buf;
+- svr = vr;
++ svr = (char*) vr;
+ in_offs = 0L;
+ out_offs = 0L;
+ lite_PD_convert(&vbuf, &svr, intype, outtype, nitems,
diff --git a/debian/patches/series b/debian/patches/series
index 8b84e6c..9208253 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ autoreconf.patch
security-fix.patch
spell.patch
python3.patch
+compile-fixes.patch
diff --git a/debian/rules b/debian/rules
index 62c93d2..b1a0666 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,9 @@ include /usr/share/mpi-default-dev/debian_defaults
MPI_INC=/usr/lib/$(ARCH_DEFAULT_MPI_IMPL)/include
ifeq ($(ARCH_DEFAULT_MPI_IMPL),lam)
- CC:=mpicc.lam
+ CC:=mpic++.lam
else
- CC:=mpicc
+ CC:=mpic++
endif
PYVERS:= `pyversions -s`
@@ -26,17 +26,15 @@ override_dh_autoreconf:
dh_autoreconf --as-needed
override_dh_auto_configure:
- LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I/usr/include/qt4 -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I$(MPI_INC) $(CPPFLAGS)" CC=$(CC) CFLAGS="$(CFLAGS)"
+ LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-Qt-bin=/usr/bin --with-Qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I/usr/include/qt4 -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I$(MPI_INC) $(CPPFLAGS)" CC=$(CC) CFLAGS="$(CFLAGS) -fpermissive"
override_dh_auto_build:
dh_auto_build
set -e ; for p in $(PYVERS) ; do \
LDFLAGS=" -Wl,--as-needed $(LDFLAGS)" dh_auto_configure -- \
--enable-pythonmodule --enable-silex \
- --with-qt=/usr --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib \
- --with-qt-include=/usr/include/qt4 \
- --with-hdf5=/usr/include,/usr/lib PYTHON=$$p CPPFLAGS=" -I$(MPI_INC) $(CPPFLAGS)" CC=$(CC) CFLAGS="$(CFLAGS)" ;
- QT_MOC=moc-qt4 \
+ --with-Qt=/usr --with-Qt-bin=/usr/bin --with-Qt-include=/usr/include/qt4 \
+ --with-hdf5=/usr/include,/usr/lib PYTHON=$$p CPPFLAGS=" -I$(MPI_INC) $(CPPFLAGS)" CC=$(CC) CFLAGS="$(CFLAGS) -fpermissive" ;
$(MAKE) -C tools/browser CXX=$(CC) ; \
$(MAKE) -C tools/python ; \
mkdir -p debian/tmp/usr/lib/pyshared/$$p ; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git
More information about the debian-science-commits
mailing list