Accepting request 221153 from home:oertel:branches:systemsmanagement

- at least set an soname, a version would be even better

OBS-URL: https://build.opensuse.org/request/show/221153
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/lmdb?expand=0&rev=3
This commit is contained in:
Klaus Kämpf 2014-02-09 12:09:56 +00:00 committed by Git OBS Bridge
parent 15156f45d8
commit cf384bfc96
3 changed files with 32 additions and 7 deletions

View File

@ -1,7 +1,6 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-liblmdb/Makefile ./Makefile
--- ../orig-liblmdb/Makefile 2014-01-31 09:23:13.341427766 +0100
+++ ./Makefile 2014-02-03 14:50:45.989580826 +0100
@@ -23,7 +23,7 @@
--- liblmdb/Makefile
+++ liblmdb/Makefile
@@ -23,12 +23,12 @@
CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS)
LDLIBS =
SOLIBS =
@ -10,7 +9,13 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
########################################################################
@@ -36,9 +36,9 @@
IHDRS = lmdb.h
-ILIBS = liblmdb.a liblmdb.so
+ILIBS = liblmdb.a liblmdb.so liblmdb.so.0
IPROGS = mdb_stat mdb_copy
IDOCS = mdb_stat.1 mdb_copy.1
PROGS = $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
@@ -36,9 +36,11 @@
install: $(ILIBS) $(IPROGS) $(IHDRS)
for f in $(IPROGS); do cp $$f $(DESTDIR)$(prefix)/bin; done
@ -19,6 +24,23 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
for f in $(IHDRS); do cp $$f $(DESTDIR)$(prefix)/include; done
- for f in $(IDOCS); do cp $$f $(DESTDIR)$(prefix)/man/man1; done
+ for f in $(IDOCS); do cp $$f $(DESTDIR)/$(MANDIR)/man1; done
+ rm $(DESTDIR)$(prefix)/$(LIB)/liblmdb.so
+ ln -sf liblmdb.so.0 $(DESTDIR)$(prefix)/$(LIB)/liblmdb.so
clean:
rm -rf $(PROGS) *.[ao] *.so *~ testdb
@@ -50,9 +52,12 @@
liblmdb.a: mdb.o midl.o
ar rs $@ mdb.o midl.o
-liblmdb.so: mdb.o midl.o
+liblmdb.so.0: mdb.o midl.o
# $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
- $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.o midl.o $(SOLIBS)
+ $(CC) $(LDFLAGS) -pthread -shared -Wl,-soname,liblmdb.so.0 -o $@ mdb.o midl.o $(SOLIBS)
+
+liblmdb.so: liblmdb.so.0
+ ln -sf liblmdb.so.0 $@
mdb_stat: mdb_stat.o liblmdb.a
mdb_copy: mdb_copy.o liblmdb.a

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 6 15:27:13 CET 2014 - ro@suse.de
- at least set an soname, a version would be even better
-------------------------------------------------------------------
Mon Feb 3 17:58:23 UTC 2014 - kkaempf@suse.com

View File

@ -92,8 +92,6 @@ install -d %{buildroot}%{_libdir}
install -d %{buildroot}%{_mandir}/man1
install -d %{buildroot}%{_prefix}/include
MANDIR=%{_mandir} LIB=%{_lib} %{__make} install DESTDIR=%{buildroot}
mv %{buildroot}%{_libdir}/liblmdb.so %{buildroot}%{_libdir}/liblmdb0.so.0
(cd %{buildroot}%{_libdir}; ln -s liblmdb0.so.0 liblmdb.so)
install -m 644 lmdb.h %{buildroot}%{_prefix}/include
rm -f %{buildroot}%{_libdir}/*.a