[silo-llnl] 23/96: Add version-info to Makefile.in

Alastair McKinstry mckinstry at moszumanska.debian.org
Tue Jul 21 13:09:28 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 0ac9f35cdc432b3e570fa08a5cb52eefd86c7778
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Aug 28 15:25:49 2011 +0100

    Add version-info to Makefile.in
---
 debian/patches/version-script.patch | 56 +++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index e0448c3..adab540 100644
--- a/debian/patches/version-script.patch
+++ b/debian/patches/version-script.patch
@@ -5,8 +5,8 @@ Forwarded: no
 
 Index: silo-llnl-4.8/configure.ac
 ===================================================================
---- silo-llnl-4.8.orig/configure.ac	2011-08-28 14:18:28.000000000 +0100
-+++ silo-llnl-4.8/configure.ac	2011-08-28 14:18:28.000000000 +0100
+--- silo-llnl-4.8.orig/configure.ac	2011-08-28 15:01:27.000000000 +0100
++++ silo-llnl-4.8/configure.ac	2011-08-28 15:01:27.000000000 +0100
 @@ -359,6 +359,9 @@
  dnl     Mark C. Miller, Wed Jul 21 09:31:24 PDT 2010
  dnl     Adjusted logic to support BSD releases which will NOT include
@@ -33,8 +33,8 @@ Index: silo-llnl-4.8/configure.ac
  
 Index: silo-llnl-4.8/src/Makefile.am
 ===================================================================
---- silo-llnl-4.8.orig/src/Makefile.am	2011-08-28 14:18:28.000000000 +0100
-+++ silo-llnl-4.8/src/Makefile.am	2011-08-28 14:18:28.000000000 +0100
+--- silo-llnl-4.8.orig/src/Makefile.am	2011-08-28 15:01:27.000000000 +0100
++++ silo-llnl-4.8/src/Makefile.am	2011-08-28 15:01:27.000000000 +0100
 @@ -101,7 +101,7 @@
     $(DRIVER_LIBS) \
     unknown/libsilo_unknown.la \
@@ -47,15 +47,13 @@ Index: silo-llnl-4.8/src/Makefile.am
 Index: silo-llnl-4.8/silo.ver
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ silo-llnl-4.8/silo.ver	2011-08-28 14:18:28.000000000 +0100
-@@ -0,0 +1,324 @@
++++ silo-llnl-4.8/silo.ver	2011-08-28 15:11:11.000000000 +0100
+@@ -0,0 +1,312 @@
 +SILO_4.8 { 
 +   global:
 +	DBOpenReal;
 +	DBCreateReal;
 +	DBInqFileReal;
-+
-+	/* Prototypes for regular API functions. */
 +	DBAllocCompoundarray;
 +	DBAllocCurve;
 +	DBAllocDefvars;
@@ -107,7 +105,6 @@ Index: silo-llnl-4.8/silo.ver
 +	DBFreeCompoundarray;
 +	DBFreeCurve;
 +	DBFreeNamescheme;
-+
 +	DBSetDataReadMask;
 +	DBGetDataReadMask;
 +	DBSetAllowOverwrites;
@@ -157,7 +154,7 @@ Index: silo-llnl-4.8/silo.ver
 +	DBGetToc;
 +	DBNewToc;
 +	DBSortObjectsByOffset;
-+	DBFilters
++	DBFilters;
 +	DBFilterRegistration;
 +	DBGetAtt;
 +	DBGetObject;
@@ -275,13 +272,9 @@ Index: silo-llnl-4.8/silo.ver
 +	DBGetName;
 +	DBStringArrayToStringList;
 +	DBStringListToStringArray;
-+
-+	/* callbacks */
 +	DBOpenCB;
 +	DBCreateCB;
 +	DBFSingleCB;
-+	
-+	/* Fortran versions */
 +	dbsetdirid_;
 +	dbgethdfnms_;
 +	dbsethdfnms_;
@@ -362,21 +355,16 @@ Index: silo-llnl-4.8/silo.ver
 +	dbunregfopts_;
 +	dbshowerrors_;
 +	dbputcurve_;
-+
-+	safe_strdup(const char *s); /* FIXME: Should this one really be exported? */
-+
-+	/* Public global variables. */
 +	DBDebugAPI;
 +	db_errno; 
 +	db_errfunc;
-+
 +    local:
 +	*;
-+}
++};
 Index: silo-llnl-4.8/configure
 ===================================================================
---- silo-llnl-4.8.orig/configure	2011-08-28 14:18:28.000000000 +0100
-+++ silo-llnl-4.8/configure	2011-08-28 14:18:28.000000000 +0100
+--- silo-llnl-4.8.orig/configure	2011-08-28 15:01:27.000000000 +0100
++++ silo-llnl-4.8/configure	2011-08-28 15:01:27.000000000 +0100
 @@ -839,6 +839,7 @@
  MAINTAINER_MODE_FALSE
  MAINT
@@ -396,8 +384,8 @@ Index: silo-llnl-4.8/configure
  # Check whether --enable-pythonmodule was given.
 Index: silo-llnl-4.8/Makefile.in
 ===================================================================
---- silo-llnl-4.8.orig/Makefile.in	2011-08-28 14:18:24.000000000 +0100
-+++ silo-llnl-4.8/Makefile.in	2011-08-28 14:18:28.000000000 +0100
+--- silo-llnl-4.8.orig/Makefile.in	2011-08-28 15:01:23.000000000 +0100
++++ silo-llnl-4.8/Makefile.in	2011-08-28 15:01:27.000000000 +0100
 @@ -185,7 +185,7 @@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -409,23 +397,31 @@ Index: silo-llnl-4.8/Makefile.in
  LIBTOOL = @LIBTOOL@
 Index: silo-llnl-4.8/src/Makefile.in
 ===================================================================
---- silo-llnl-4.8.orig/src/Makefile.in	2011-08-28 14:55:53.000000000 +0100
-+++ silo-llnl-4.8/src/Makefile.in	2011-08-28 14:56:17.000000000 +0100
-@@ -359,7 +359,7 @@
+--- silo-llnl-4.8.orig/src/Makefile.in	2011-08-28 15:01:27.000000000 +0100
++++ silo-llnl-4.8/src/Makefile.in	2011-08-28 15:25:23.000000000 +0100
+@@ -67,6 +67,7 @@
+ # be used for advertising or product endorsement purposes.
+ #
+ 
++SONAME = libiloh5-0
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -359,7 +360,7 @@
  @HDF5_DRV_NEEDED_TRUE@   unknown/libsilo_unknown.la \
  @HDF5_DRV_NEEDED_TRUE@   filters/libsilo_filters.la 
  
 - at HDF5_DRV_NEEDED_TRUE@libsiloh5_la_LDFLAGS =
-+ at HDF5_DRV_NEEDED_TRUE@libsiloh5_la_LDFLAGS = -Wl,--version-script,../silo.ver -Wl,-O1
++ at HDF5_DRV_NEEDED_TRUE@libsiloh5_la_LDFLAGS = -export-dynamic -version-info $(SONAME)  -Wl,--version-script,../silo.ver -Wl,-O1
  @HDF5_DRV_NEEDED_FALSE at libsilo_la_SOURCES = silo_version.c
  @HDF5_DRV_NEEDED_FALSE at libsilo_la_LIBADD = \
  @HDF5_DRV_NEEDED_FALSE@   score/libsilo_score.la \
-@@ -370,7 +370,7 @@
+@@ -370,7 +371,7 @@
  @HDF5_DRV_NEEDED_FALSE@   unknown/libsilo_unknown.la \
  @HDF5_DRV_NEEDED_FALSE@   filters/libsilo_filters.la 
  
 - at HDF5_DRV_NEEDED_FALSE@libsilo_la_LDFLAGS = 
-+ at HDF5_DRV_NEEDED_FALSE@libsilo_la_LDFLAGS =  -Wl,--version-script,../silo.ver -Wl,-O1
++ at HDF5_DRV_NEEDED_FALSE@libsilo_la_LDFLAGS =  -export-dynamic -version-info $(SONAME)  -Wl,--version-script,../silo.ver -Wl,-O1
  BUILT_SOURCES = $(MAKESETTINGS)
  all: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive

-- 
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