From 8a6b6f0880c693cb7a655b04a5638d9cac6fe70c Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Thu, 30 Jul 2015 09:57:08 +0000 Subject: [PATCH] Switch to versioned liblwgeom interface (#2278) See https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html git-svn-id: http://svn.osgeo.org/postgis/trunk@13855 b70326c6-7e19-0410-871a-916f4a2858ee --- NEWS | 1 + liblwgeom/Makefile.in | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 88095b9ef..781b5d8d9 100644 --- a/NEWS +++ b/NEWS @@ -96,6 +96,7 @@ PostGIS 2.2.0 * Enhancements * + - #2278, Make liblwgeom compatible between minor releases - #897, ST_AsX3D support for GeoCoordinates and systems "GD" "WE" ability to flip x/y axis (use option = 2, 3) - ST_Split: allow splitting lines by multilines, multipoints diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in index a218f0511..84247b272 100644 --- a/liblwgeom/Makefile.in +++ b/liblwgeom/Makefile.in @@ -22,7 +22,11 @@ SHELL = @SHELL@ INSTALL = $(SHELL) ../install-sh LIBTOOL = @LIBTOOL@ -SOVER = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@.@POSTGIS_MICRO_VERSION@ +IFACE_CURRENT = $(shell expr @POSTGIS_MAJOR_VERSION@ + @POSTGIS_MINOR_VERSION@ ) +IFACE_AGE = @POSTGIS_MINOR_VERSION@ +IFACE_REV = $(subst dev,,@POSTGIS_MICRO_VERSION@) + +VERSION_INFO = $(IFACE_CURRENT):$(IFACE_REV):$(IFACE_AGE) YACC=@YACC@ @@ -156,7 +160,8 @@ $(LT_OBJS): ../postgis_config.h ../postgis_svn_revision.h $(SA_HEADERS) #ar rs liblwgeom.a $(SA_OBJS) $(NM_OBJS) liblwgeom.la: $(LT_OBJS) - $(LIBTOOL) --tag=CC --mode=link $(CC) -rpath $(libdir) $(LT_OBJS) -release $(SOVER) $(LDFLAGS) -o $@ + $(LIBTOOL) --tag=CC --mode=link $(CC) -rpath $(libdir) $(LT_OBJS) \ + -version-info $(VERSION_INFO) $(LDFLAGS) -o $@ maintainer-clean: clean rm -f lwin_wkt_lex.c -- 2.50.0