[libmseed] 07/07: refreshed patches
Pierre Duperray
zulu-guest at moszumanska.debian.org
Fri Mar 3 20:19:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
zulu-guest pushed a commit to branch master
in repository libmseed.
commit 617d762847747f81e64c8e878236c72785f2d438
Author: Pierre Duperray <pierreduperray at free.fr>
Date: Fri Mar 3 20:45:15 2017 +0100
refreshed patches
---
debian/patches/0001-added-install-rule.patch | 51 ++++++++++++++++++++--------
1 file changed, 36 insertions(+), 15 deletions(-)
diff --git a/debian/patches/0001-added-install-rule.patch b/debian/patches/0001-added-install-rule.patch
index 6b2dfdd..6ae6ac9 100644
--- a/debian/patches/0001-added-install-rule.patch
+++ b/debian/patches/0001-added-install-rule.patch
@@ -5,16 +5,17 @@ Subject: - added install rule - fixed a bug for passing the test suite when
symbols
---
- Makefile | 40 ++++++++++++++++++++++++++++++++--------
- libmseed.sym | 8 ++++++++
- mseed.pc.in | 12 ++++++++++++
- test/Makefile | 4 +++-
- 4 files changed, 55 insertions(+), 9 deletions(-)
- create mode 100644 libmseed.sym
+ Makefile | 40 ++++++++++++++++++++++++++++++++--------
+ example/Makefile | 6 +++---
+ libmseed.map | 11 +++++++++++
+ mseed.pc.in | 12 ++++++++++++
+ test/Makefile | 4 +++-
+ 5 files changed, 61 insertions(+), 12 deletions(-)
+ create mode 100644 libmseed.map
create mode 100644 mseed.pc.in
diff --git a/Makefile b/Makefile
-index 2cb7c9a..6a6009f 100644
+index 2cb7c9a..6ec4abd 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,23 @@
@@ -46,7 +47,7 @@ index 2cb7c9a..6a6009f 100644
$(LIB_SO): $(LIB_DOBJS)
rm -f $(LIB_SO) $(LIB_SO_FILENAME)
- $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,$(LIB_SO_ALIAS) -o $(LIB_SO) $(LIB_DOBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--version-script=libmseed.sym -Wl,-soname -Wl,$(LIB_SO_ALIAS) -o $(LIB_SO) $(LIB_DOBJS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--version-script=libmseed.map -Wl,-soname -Wl,$(LIB_SO_ALIAS) -o $(LIB_SO) $(LIB_DOBJS)
ln -s $(LIB_SO) $(LIB_SO_ALIAS)
ln -s $(LIB_SO) $(LIB_SO_FILENAME)
@@ -91,21 +92,41 @@ index 2cb7c9a..6a6009f 100644
+ $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
FORCE:
-diff --git a/libmseed.sym b/libmseed.sym
+diff --git a/example/Makefile b/example/Makefile
+index 6cc4532..ef11938 100644
+--- a/example/Makefile
++++ b/example/Makefile
+@@ -5,10 +5,10 @@
+ # CFLAGS : Specify compiler options to use
+
+ # Required compiler parameters
+-CFLAGS += -I..
++CFLAGS += `pkg-config --cflags mseed`
+
+-LDFLAGS = -L..
+-LDLIBS = -lmseed
++LDFLAGS = `pkg-config --libs-only-L mseed`
++LDLIBS = `pkg-config --libs-only-l mseed`
+
+ all: msview msrepack
+
+diff --git a/libmseed.map b/libmseed.map
new file mode 100644
-index 0000000..d7ba10e
+index 0000000..27c5ab6
--- /dev/null
-+++ b/libmseed.sym
-@@ -0,0 +1,8 @@
++++ b/libmseed.map
+@@ -0,0 +1,11 @@
+{
+ global:
-+ ms_*; msr_*; mst_*; mstl_*;
++ ms_*;
++ msr_*;
++ mst_*;
++ mstl_*;
++ unpackencodingformat;
+
+ local:
+ *;
+};
-+
-\ No newline at end of file
diff --git a/mseed.pc.in b/mseed.pc.in
new file mode 100644
index 0000000..7fcac74
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libmseed.git
More information about the debian-science-commits
mailing list