diff options
| -rw-r--r-- | bfd/Makefile.am | 5 | ||||
| -rw-r--r-- | bfd/Makefile.in | 4 | ||||
| -rwxr-xr-x | bfd/configure | 13 | ||||
| -rw-r--r-- | bfd/configure.ac | 7 |
4 files changed, 29 insertions, 0 deletions
diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 3f3487f6a46..74fcaf68f58 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -59,6 +59,8 @@ bfdinclude_HEADERS += $(INCDIR)/plugin-api.h LIBDL = @lt_cv_dlopen_libs@ endif +EXTRA_SOVERSION_SUFFIX = @EXTRA_SOVERSION_SUFFIX@ + # bfd.h goes here, for now BFD_H = bfd.h @@ -961,6 +963,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ fi ;\ + if test x"$(EXTRA_SOVERSION_SUFFIX)" != x ; then \ + bfd_soversion="$${bfd_soversion}.$(EXTRA_SOVERSION_SUFFIX)" ;\ + fi ;\ $(SED) -e "s,@bfd_version@,$$bfd_version," \ -e "s,@bfd_version_string@,$$bfd_version_string," \ -e "s,@bfd_version_package@,$$bfd_version_package," \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index cc27ef0a62f..71c22e4594f 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -317,6 +317,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ +EXTRA_SOVERSION_SUFFIX = @EXTRA_SOVERSION_SUFFIX@ FGREP = @FGREP@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ @@ -2073,6 +2074,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ fi ;\ + if test x"$(EXTRA_SOVERSION_SUFFIX)" != x ; then \ + bfd_soversion="$${bfd_soversion}.$(EXTRA_SOVERSION_SUFFIX)" ;\ + fi ;\ $(SED) -e "s,@bfd_version@,$$bfd_version," \ -e "s,@bfd_version_string@,$$bfd_version_string," \ -e "s,@bfd_version_package@,$$bfd_version_package," \ diff --git a/bfd/configure b/bfd/configure index 0cfe56861ae..ab20f17cce1 100755 --- a/bfd/configure +++ b/bfd/configure @@ -696,6 +696,7 @@ WARN_CFLAGS REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION +EXTRA_SOVERSION_SUFFIX DEBUGDIR PLUGINS_FALSE PLUGINS_TRUE @@ -833,6 +834,7 @@ enable_secureplt enable_separate_code enable_leading_mingw64_underscores with_separate_debug_dir +with_extra_soversion_suffix with_pkgversion with_bugurl enable_werror @@ -1508,6 +1510,8 @@ Optional Packages: --with-separate-debug-dir=DIR Look for global separate debug info in DIR [[default=LIBDIR/debug]] + --with-extra-soversion-suffix=SUFFIX + Append '.SUFFIX' to SONAME [default=] --with-pkgversion=PKG Use PKG in the version string in place of "GNU Binutils" --with-bugurl=URL Direct users to URL to report a bug @@ -12520,6 +12524,15 @@ fi +EXTRA_SOVERSION_SUFFIX= + +# Check whether --with-extra-soversion-suffix was given. +if test "${with_extra_soversion_suffix+set}" = set; then : + withval=$with_extra_soversion_suffix; EXTRA_SOVERSION_SUFFIX="${withval}" +fi + + + # Check whether --with-pkgversion was given. diff --git a/bfd/configure.ac b/bfd/configure.ac index c6193cd8a4b..eb30300e04d 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -137,6 +137,13 @@ AC_ARG_WITH(separate-debug-dir, [DEBUGDIR="${withval}"]) AC_SUBST(DEBUGDIR) +EXTRA_SOVERSION_SUFFIX= +AC_ARG_WITH(extra-soversion-suffix, + AS_HELP_STRING([--with-extra-soversion-suffix=SUFFIX], + [Append '.SUFFIX' to SONAME [[default=]]]), +[EXTRA_SOVERSION_SUFFIX="${withval}"]) +AC_SUBST(EXTRA_SOVERSION_SUFFIX) + ACX_PKGVERSION([GNU Binutils]) ACX_BUGURL([http://www.sourceware.org/bugzilla/]) |