Patchwork build: restore -version-info

login
register
mail settings
Submitter Jan Engelhardt
Date July 1, 2012, 6:36 p.m.
Message ID <alpine.LNX.2.01.1207011953290.21627@frira.zrqbmnf.qr>
Download mbox | patch
Permalink /patch/168453/
State Not Applicable
Headers show

Comments

Jan Engelhardt - July 1, 2012, 6:36 p.m.
On Sunday 2012-07-01 19:20, Jozsef Kadlecsik wrote:
>[...] 
>> * therefore the patch makes a clean restart,
>>   using -version-info 3:0:0, to continue using .so.3
>>   starting from ipset-6.13 until the next *real*
>>   incompatible change.
>
>What is still unclear for me, why a clean restart is required. Looking 
>into "libtool", as I see, "-version-number 3:0:1" and "-version-info 
>3:0:1" produces the same result.

They don't. The libtool manual goes on attempting to explain
"-version-number" with C:R:A, though it could have been a lot easier
to just say "it copies the values as-is to the file suffix".


---8<---
location git://git.inai.de/ipset (updated)

parent 7c7b022a18ea2bae11d889b345caef87f3bf145e (v6.13)
commit 2b145f0794de6f56eaded0a6403be995be98c93b
Author: Jan Engelhardt <jengelh@inai.de>
Date:   Sat Jun 30 20:39:27 2012 +0200

build: restore -version-info

Commit v6.13~7 accidentally swapped "-version-info" with
"-version-number". Because "-version-number" takes the values
"FIRST:AGE:REV", which is different from "-version-info
CURRENT:REV:AGE", libipset.so.3 was emitted.

Restore using "-version-info" and continue to use 3 as the "FIRST"
interface (instead of 2), because it was declared that way in
ipset-6.13.

Also note that the version names in libipset.map generally are not
supposed to follow SO versions, but the program version):
IPSET_6.13 {...}.
---
 Make_global.am  |    2 +-
 lib/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Jozsef Kadlecsik - July 1, 2012, 8:45 p.m.
On Sun, 1 Jul 2012, Jan Engelhardt wrote:

> On Sunday 2012-07-01 19:20, Jozsef Kadlecsik wrote:
> >[...] 
> >> * therefore the patch makes a clean restart,
> >>   using -version-info 3:0:0, to continue using .so.3
> >>   starting from ipset-6.13 until the next *real*
> >>   incompatible change.
> >
> >What is still unclear for me, why a clean restart is required. Looking 
> >into "libtool", as I see, "-version-number 3:0:1" and "-version-info 
> >3:0:1" produces the same result.
> 
> They don't. The libtool manual goes on attempting to explain
> "-version-number" with C:R:A, though it could have been a lot easier
> to just say "it copies the values as-is to the file suffix".
> 
> ---8<---
> location git://git.inai.de/ipset (updated)
> 
> parent 7c7b022a18ea2bae11d889b345caef87f3bf145e (v6.13)
> commit 2b145f0794de6f56eaded0a6403be995be98c93b
> Author: Jan Engelhardt <jengelh@inai.de>
> Date:   Sat Jun 30 20:39:27 2012 +0200
> 
> build: restore -version-info
> 
> Commit v6.13~7 accidentally swapped "-version-info" with
> "-version-number". Because "-version-number" takes the values
> "FIRST:AGE:REV", which is different from "-version-info
> CURRENT:REV:AGE", libipset.so.3 was emitted.

Ohh, I got it - thanks, really. Somehow I stopped at how CURR is 
calculated from FIRST and AGE. 

Best regards,
Jozsef
-
E-mail  : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
          H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/Make_global.am b/Make_global.am
index 4a8f61a..e9f9afd 100644
--- a/Make_global.am
+++ b/Make_global.am
@@ -69,7 +69,7 @@ 
 # interface. 
 
 #            curr:rev:age
-LIBVERSION = 3:0:1
+LIBVERSION = 3:1:0
 
 AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include \
 	-I/usr/local/include
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 392b5f9..fd853dd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,7 +19,7 @@  lib_LTLIBRARIES = libipset.la
 
 include $(top_srcdir)/lib/Make_extra.am
 
-libipset_la_LDFLAGS = -Wl,--version-script=$(top_srcdir)/lib/libipset.map -version-number $(LIBVERSION)
+libipset_la_LDFLAGS = -Wl,--version-script=$(top_srcdir)/lib/libipset.map -version-info $(LIBVERSION)
 libipset_la_LIBADD  = ${libmnl_LIBS} $(IPSET_SETTYPE_STATIC_OBJECTS)
 libipset_la_SOURCES = \
 	data.c \