diff options
author | 2021-07-25 00:38:24 +0200 | |
---|---|---|
committer | 2021-07-25 00:38:24 +0200 | |
commit | e460e013c716610ad3ac5e092a6c1dd8f1bced3b (patch) | |
tree | 1e36921c0650f65e62b2a06d3acf6be8ee11968a | |
parent | Gentoo: Give also libctf optionally a gentoo-specific soversion (diff) | |
download | binutils-gdb-e460e013c716610ad3ac5e092a6c1dd8f1bced3b.tar.gz binutils-gdb-e460e013c716610ad3ac5e092a6c1dd8f1bced3b.tar.bz2 binutils-gdb-e460e013c716610ad3ac5e092a6c1dd8f1bced3b.zip |
Gentoo: libctf: We use the bdf / binutils version as soversiongentoo/binutils-2.36.1-4
-rw-r--r-- | libctf/Makefile.am | 3 | ||||
-rw-r--r-- | libctf/Makefile.in | 3 | ||||
-rwxr-xr-x | libctf/configure | 8 | ||||
-rw-r--r-- | libctf/configure.ac | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/libctf/Makefile.am b/libctf/Makefile.am index a9aacea6acc..1a45ad70515 100644 --- a/libctf/Makefile.am +++ b/libctf/Makefile.am @@ -22,6 +22,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd AUTOMAKE_OPTIONS = dejagnu foreign no-texinfo.tex EXTRA_SOVERSION_SUFFIX = @EXTRA_SOVERSION_SUFFIX@ +BFD_VERSION = @BFD_VERSION@ # This is where we get zlib from. zlibdir is -L../zlib and zlibinc is # -I../zlib, unless we were configured with --with-system-zlib, in which @@ -47,7 +48,7 @@ endif # a supplement to the soversion. So we need to switch tracks and be creative. if HAVE_EXTRA_SOVERSION_SUFFIX -gentoo_ctf_soversion = 0.0.0.$(EXTRA_SOVERSION_SUFFIX) +gentoo_ctf_soversion = "$(BFD_VERSION).$(EXTRA_SOVERSION_SUFFIX)" else gentoo_ctf_soversion = 0.0.0 endif diff --git a/libctf/Makefile.in b/libctf/Makefile.in index efb4cc2b3e0..c36c83792c1 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in @@ -311,6 +311,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BFD_VERSION = @BFD_VERSION@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -462,7 +463,7 @@ AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @ # libctf by default uses libtool versioning. Unfortunately that keeps us from adding # a supplement to the soversion. So we need to switch tracks and be creative. -@HAVE_EXTRA_SOVERSION_SUFFIX_TRUE@gentoo_ctf_soversion = 0.0.0.$(EXTRA_SOVERSION_SUFFIX) +@HAVE_EXTRA_SOVERSION_SUFFIX_TRUE@gentoo_ctf_soversion = "$(BFD_VERSION).$(EXTRA_SOVERSION_SUFFIX)" libctf_nobfd_la_LIBADD = @CTF_LIBADD@ $(LIBINTL) $(ZLIB) libctf_nobfd_la_LDFLAGS = -release $(gentoo_ctf_soversion) @SHARED_LDFLAGS@ @VERSION_FLAGS@ libctf_nobfd_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=1 diff --git a/libctf/configure b/libctf/configure index 648c90ae565..59553613045 100755 --- a/libctf/configure +++ b/libctf/configure @@ -640,6 +640,7 @@ CTF_LIBADD SHARED_LDFLAGS NEED_CTF_QSORT_R_FALSE NEED_CTF_QSORT_R_TRUE +BFD_VERSION HAVE_EXTRA_SOVERSION_SUFFIX_FALSE HAVE_EXTRA_SOVERSION_SUFFIX_TRUE EXTRA_SOVERSION_SUFFIX @@ -11514,7 +11515,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11529 "configure" +#line 11530 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11620,7 +11621,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11635 "configure" +#line 11636 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12844,6 +12845,9 @@ else fi +BFD_VERSION=$(${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p') + + # Similar to GDB_AC_CHECK_BFD. OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS diff --git a/libctf/configure.ac b/libctf/configure.ac index 66063bd2106..423a773443b 100644 --- a/libctf/configure.ac +++ b/libctf/configure.ac @@ -82,6 +82,8 @@ AC_ARG_WITH(extra-soversion-suffix, AC_SUBST(EXTRA_SOVERSION_SUFFIX) AM_CONDITIONAL([HAVE_EXTRA_SOVERSION_SUFFIX], [test -n "${with_extra_soversion_suffix}"]) +AC_SUBST(BFD_VERSION, $(${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'), [Version of the accompanying bfd linker]) + # Similar to GDB_AC_CHECK_BFD. OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS |