[dune-alugrid] 07/07: Commit current patch series for 2.3 release branch.
Ansgar Burchardt
ansgar at moszumanska.debian.org
Fri Dec 19 13:57:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
ansgar pushed a commit to branch master
in repository dune-alugrid.
commit cf3107de029ccce0097bea4e68ad96e199a19f30
Author: Ansgar Burchardt <ansgar at debian.org>
Date: Fri Dec 19 14:56:02 2014 +0100
Commit current patch series for 2.3 release branch.
---
debian/patches/build-order.patch | 18 ++++++++
debian/patches/install-cc.patch | 70 +++++++++++++++++++++++++++++++
debian/patches/install-location.patch | 51 ++++++++++++++++++++++
debian/patches/link-more-libraries.patch | 11 +++++
debian/patches/pkg-config-libraries.patch | 16 +++++++
debian/patches/series | 6 +++
debian/patches/soname.patch | 38 +++++++++++++++++
7 files changed, 210 insertions(+)
diff --git a/debian/patches/build-order.patch b/debian/patches/build-order.patch
new file mode 100644
index 0000000..094e250
--- /dev/null
+++ b/debian/patches/build-order.patch
@@ -0,0 +1,18 @@
+From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
+Date: Fri, 26 Sep 2014 17:33:29 +0200
+Subject: lib/Makefile.am: fix order of shared libraries
+
+libalugrid_parallel.la needs libalugrid_serial.la, but is listed first. This
+makes libtool unhappy when building the shared libraries.
+
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -45,7 +45,7 @@
+ libalugrid_parallel_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
+ libalugrid_parallel_la_LDFLAGS = $(AM_LDFLAGS) -release $(subst -,,$(PACKAGE_VERSION))
+ libalugrid_parallel_la_LIBADD = $(ALL_PKG_LIBS) libalugrid_serial.la ${ZOLTAN_LIBS} ${PARMETIS_LIBS} ${METIS_LIB} $(ZLIB_LIBS)
+-ALUGRID_IMPL_LIBS=libalugrid_2d.la libalugrid_parallel.la libalugrid_serial.la
++ALUGRID_IMPL_LIBS=libalugrid_2d.la libalugrid_serial.la libalugrid_parallel.la
+
+ lib_LTLIBRARIES = $(ALUGRID_IMPL_LIBS) libdunealugrid.la
+
diff --git a/debian/patches/install-cc.patch b/debian/patches/install-cc.patch
new file mode 100644
index 0000000..68ff896
--- /dev/null
+++ b/debian/patches/install-cc.patch
@@ -0,0 +1,70 @@
+From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
+Date: Fri, 19 Dec 2014 14:02:01 +0100
+Subject: Install *.cc files
+
+These are included by header files and therefore need to be installed
+as headers and not just distributed.
+
+--- a/dune/alugrid/impl/2d/Makefile.am
++++ b/dune/alugrid/impl/2d/Makefile.am
+@@ -1,6 +1,5 @@
+ impl2ddir = $(includedir)/dune/alugrid/impl/2d
+-impl2d_HEADERS = grid.h handle.h listwalk.h triang.h vmmap.h vtx_btree.h vtxprojection.h
+-
+-EXTRA_DIST = grid.cc mknbrs.cc vmmap.cc hdlrw.h handle.cc triang.cc vtx_btree.cc grid_imp.cc
++impl2d_HEADERS = grid.h handle.h listwalk.h triang.h vmmap.h vtx_btree.h vtxprojection.h \
++ grid.cc mknbrs.cc vmmap.cc hdlrw.h handle.cc triang.cc vtx_btree.cc grid_imp.cc
+
+ include $(top_srcdir)/am/global-rules
+--- a/dune/alugrid/impl/Makefile.am
++++ b/dune/alugrid/impl/Makefile.am
+@@ -1,8 +1,7 @@
+ impldir = $(includedir)/dune/alugrid/impl
+-impl_HEADERS = binaryio.hh byteorder.hh indexstack.h macrofileheader.hh projectvertex.h
++impl_HEADERS = binaryio.hh byteorder.hh indexstack.h macrofileheader.hh projectvertex.h \
++ binaryio.cc macrofileheader.cc
+
+ SUBDIRS = serial parallel duneinterface 2d test
+
+-EXTRA_DIST = binaryio.cc macrofileheader.cc
+-
+ include $(top_srcdir)/am/global-rules
+--- a/dune/alugrid/impl/duneinterface/Makefile.am
++++ b/dune/alugrid/impl/duneinterface/Makefile.am
+@@ -1,6 +1,5 @@
+ duneinterfacedir = $(includedir)/dune/alugrid/impl/duneinterface
+-duneinterface_HEADERS = gitter_dune_impl.h gitter_dune_pll_impl.h
+-
+-EXTRA_DIST = gitter_dune_impl.cc gitter_dune_pll_impl.cc
++duneinterface_HEADERS = gitter_dune_impl.h gitter_dune_pll_impl.h \
++ gitter_dune_impl.cc gitter_dune_pll_impl.cc
+
+ include $(top_srcdir)/am/global-rules
+--- a/dune/alugrid/impl/parallel/Makefile.am
++++ b/dune/alugrid/impl/parallel/Makefile.am
+@@ -3,9 +3,8 @@
+ gitter_hexa_top_pll.h gitter_pll_impl.h \
+ gitter_pll_ldb.h gitter_pll_mgb.h \
+ gitter_pll_sti.h gitter_tetra_top_pll.h mpAccess.h \
+- mpAccess_MPI.h mpAccess_MPI_inline.h
+-
+-EXTRA_DIST = gitter_hexa_top_pll.cc gitter_pll_idn.cc gitter_pll_impl.cc \
++ mpAccess_MPI.h mpAccess_MPI_inline.h \
++ gitter_hexa_top_pll.cc gitter_pll_idn.cc gitter_pll_impl.cc \
+ gitter_pll_ldb.cc gitter_pll_mgb.cc gitter_pll_sti.cc \
+ gitter_tetra_top_pll.cc mpAccess.cc
+
+--- a/dune/alugrid/impl/serial/Makefile.am
++++ b/dune/alugrid/impl/serial/Makefile.am
+@@ -3,9 +3,8 @@
+ gitter_hexa_top.h gitter_impl.h gitter_mgb.h gitter_sti.h \
+ gitter_tetra_top.h iterator_sti.h key.h lock.h mapp_cube_3d.h \
+ mapp_tetra_3d_ext.h mapp_tetra_3d.h myalloc.h parallel.h \
+- refcount.hh refinementrules.h serialize.h walk.h
+-
+-EXTRA_DIST = ghost_elements.cc ghost_info.cc gitter_geo.cc gitter_hexa_top.cc \
++ refcount.hh refinementrules.h serialize.h walk.h \
++ ghost_elements.cc ghost_info.cc gitter_geo.cc gitter_hexa_top.cc \
+ gitter_impl.cc gitter_mgb.cc gitter_sti.cc gitter_tetra_top.cc \
+ mapp_cube_3d.cc mapp_tetra_3d.cc myalloc.cc
+
diff --git a/debian/patches/install-location.patch b/debian/patches/install-location.patch
new file mode 100644
index 0000000..930ba05
--- /dev/null
+++ b/debian/patches/install-location.patch
@@ -0,0 +1,51 @@
+From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
+Date: Fri, 26 Sep 2014 17:33:29 +0200
+Subject: Fix install location of several files
+
+Install autoconf tests and some headers to the correct location.
+
+--- a/m4/Makefile.am
++++ b/m4/Makefile.am
+@@ -1,6 +1,6 @@
+ M4FILES = dune-alugrid.m4 alugridtype.m4 dlmalloc.m4 sionlib.m4 zlib.m4 zoltan.m4
+
+-aclocaldir = $(datadir)/aclocal
++aclocaldir = $(datadir)/dune/aclocal
+ aclocal_DATA = $(M4FILES)
+
+ EXTRA_DIST = $(M4FILES)
+--- a/utils/convert-macrogrid/Makefile.am
++++ b/utils/convert-macrogrid/Makefile.am
+@@ -1,7 +1,6 @@
+ EXTRA_PROGRAMS = convert
+
+-convertdir = $(includedir)/utils/convert-macrogrid
+-convert_HEADERS = partition.hh
++noinst_HEADERS = partition.hh
+
+ convert_SOURCES = main.cc
+
+--- a/dune/alugrid/impl/duneinterface/Makefile.am
++++ b/dune/alugrid/impl/duneinterface/Makefile.am
+@@ -1,4 +1,4 @@
+-duneinterfacedir = dune/alugrid/impl/duneinterface
++duneinterfacedir = $(includedir)/dune/alugrid/impl/duneinterface
+ duneinterface_HEADERS = gitter_dune_impl.h gitter_dune_pll_impl.h
+
+ EXTRA_DIST = gitter_dune_impl.cc gitter_dune_pll_impl.cc
+--- a/dune/alugrid/impl/parallel/Makefile.am
++++ b/dune/alugrid/impl/parallel/Makefile.am
+@@ -1,4 +1,4 @@
+-paralleldir = dune/alugrid/impl/parallel
++paralleldir = $(includedir)/dune/alugrid/impl/parallel
+ parallel_HEADERS = alumetis.hh alusfc.hh aluzoltan.hh \
+ gitter_hexa_top_pll.h gitter_pll_impl.h \
+ gitter_pll_ldb.h gitter_pll_mgb.h \
+--- a/dune/alugrid/impl/serial/Makefile.am
++++ b/dune/alugrid/impl/serial/Makefile.am
+@@ -1,4 +1,4 @@
+-serialdir = dune/alugrid/impl/serial
++serialdir = $(includedir)/dune/alugrid/impl/serial
+ serial_HEADERS = gatherscatter.hh ghost_elements.h ghost_info.h \
+ gitter_hexa_top.h gitter_impl.h gitter_mgb.h gitter_sti.h \
+ gitter_tetra_top.h iterator_sti.h key.h lock.h mapp_cube_3d.h \
diff --git a/debian/patches/link-more-libraries.patch b/debian/patches/link-more-libraries.patch
new file mode 100644
index 0000000..eb7ec88
--- /dev/null
+++ b/debian/patches/link-more-libraries.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,7 +8,7 @@
+
+ AC_SUBST(AM_CPPFLAGS, "\${DUNE_CPPFLAGS} -I\$(top_srcdir) \${ALUGRID_CPPFLAGS} \${SIONLIB_CPPFLAGS} \${ZOLTAN_CPPFLAGS} \${PARMETIS_CPPFLAGS} \${METIS_INCLUDE} \${ZLIB_CPPFLAGS}" )
+ AC_SUBST(AM_LDFLAGS, "\${DUNE_LDFLAGS} \${SIONLIB_LDFLAGS} \${ZOLTAN_LDFLAGS} \${ALUGRID_LDFLAGS} \${PARMETIS_LDFLAGS} \${METIS_LDFLAGS} \${ZLIB_LDFLAGS}" )
+-AC_SUBST([LDADD], "\$(top_builddir)/lib/libdunealugrid.la \${ALUGRID_LIBS} \${SIONLIB_LIBS} \${ZOLTAN_LIBS} \${DUNE_LIBS} \${PARMETIS_LIBS} \${METIS_LIB} \${ZLIB_LIBS}")
++AC_SUBST([LDADD], "\$(top_builddir)/lib/libdunealugrid.la \$(top_builddir)/lib/libalugrid_parallel.la \$(top_builddir)/lib/libalugrid_serial.la \$(top_builddir)/lib/libalugrid_2d.la \${ALUGRID_LIBS} \${SIONLIB_LIBS} \${ZOLTAN_LIBS} \${DUNE_LIBS} \${PARMETIS_LIBS} \${METIS_LIB} \${ZLIB_LIBS}")
+
+ # generate Makefiles
+ AC_CONFIG_FILES([
diff --git a/debian/patches/pkg-config-libraries.patch b/debian/patches/pkg-config-libraries.patch
new file mode 100644
index 0000000..a807d4c
--- /dev/null
+++ b/debian/patches/pkg-config-libraries.patch
@@ -0,0 +1,16 @@
+From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
+Date: Fri, 19 Dec 2014 14:02:54 +0100
+Subject: list libraries to link against in dune-alugrid.pc
+
+Otherwise the DUNE_CHECK_MODULE test for dune-alugrid fails to link a
+test program.
+
+--- a/dune-alugrid.pc.in
++++ b/dune-alugrid.pc.in
+@@ -11,5 +11,5 @@
+ Description: DUNE Adaptive, Load-balanced, and Unstructured Grid Module
+ URL: http://aam.mathematik.uni-freiburg.de/IAM/Research/alugrid/
+ Requires: ${DEPENDENCIES}
+-Libs: -L${libdir}
++Libs: -L${libdir} -lalugrid_2d -lalugrid_serial -lalugrid_parallel -ldunealugrid
+ Cflags: -I${includedir}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..570264c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+soname.patch
+build-order.patch
+install-location.patch
+link-more-libraries.patch
+install-cc.patch
+pkg-config-libraries.patch
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
new file mode 100644
index 0000000..0dc15a1
--- /dev/null
+++ b/debian/patches/soname.patch
@@ -0,0 +1,38 @@
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -8,7 +8,7 @@
+ $(top_srcdir)/dune/alugrid/impl/2d/vtx_btree.cc
+
+ libalugrid_2d_la_CPPFLAGS = $(AM_CPPFLAGS)
+-libalugrid_2d_la_LDFLAGS = $(AM_LDFLAGS)
++libalugrid_2d_la_LDFLAGS = $(AM_LDFLAGS) -release $(subst -,,$(PACKAGE_VERSION))
+ libalugrid_2d_la_LIBADD =
+
+ libalugrid_serial_la_SOURCES = \
+@@ -27,7 +27,7 @@
+ $(top_srcdir)/dune/alugrid/impl/duneinterface/gitter_dune_impl.cc
+
+ libalugrid_serial_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
+-libalugrid_serial_la_LDFLAGS = $(AM_LDFLAGS)
++libalugrid_serial_la_LDFLAGS = $(AM_LDFLAGS) -release $(subst -,,$(PACKAGE_VERSION))
+ libalugrid_serial_la_LIBADD = $(ZLIB_LIBS)
+
+ libalugrid_parallel_la_SOURCES = \
+@@ -43,7 +43,7 @@
+ $(top_srcdir)/dune/alugrid/impl/parallel/gitter_tetra_top_pll.cc
+
+ libalugrid_parallel_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
+-libalugrid_parallel_la_LDFLAGS = $(AM_LDFLAGS)
++libalugrid_parallel_la_LDFLAGS = $(AM_LDFLAGS) -release $(subst -,,$(PACKAGE_VERSION))
+ libalugrid_parallel_la_LIBADD = $(ALL_PKG_LIBS) libalugrid_serial.la ${ZOLTAN_LIBS} ${PARMETIS_LIBS} ${METIS_LIB} $(ZLIB_LIBS)
+ ALUGRID_IMPL_LIBS=libalugrid_2d.la libalugrid_parallel.la libalugrid_serial.la
+
+@@ -57,7 +57,7 @@
+ $(top_srcdir)/dune/alugrid/3d/topology.cc
+
+ libdunealugrid_la_CPPFLAGS = $(AM_CPPFLAGS)
+-libdunealugrid_la_LDFLAGS = $(AM_LDFLAGS)
++libdunealugrid_la_LDFLAGS = $(AM_LDFLAGS) -release $(subst -,,$(PACKAGE_VERSION))
+ libdunealugrid_la_LIBADD = $(DUNE_LIBS) $(ALUGRID_IMPL_LIBS)
+
+ include $(top_srcdir)/am/global-rules
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-alugrid.git
More information about the debian-science-commits
mailing list