Attachment #546790 for bug #666100

View | Details | Raw Unified | Return to bug 666100
Collapse All | Expand All

Lines 59-64 bfdinclude_HEADERS += $(INCDIR)/plugin-api.h Link Here

(-)a/bfd/Makefile.am (+5 lines)
59	LIBDL = @lt_cv_dlopen_libs@	59	LIBDL = @lt_cv_dlopen_libs@
60	endif	60	endif
61		61
		62	EXTRA_SOVERSION_SUFFIX = @EXTRA_SOVERSION_SUFFIX@
		63
62	# bfd.h goes here, for now	64	# bfd.h goes here, for now
63	BFD_H = bfd.h	65	BFD_H = bfd.h
64		66
Lines 961-966 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in Link Here
961	bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\	963	bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
962	bfd_soversion="$(VERSION).$${bfd_version_date}" ;\	964	bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
963	fi ;\	965	fi ;\
		966	if test x"$(EXTRA_SOVERSION_SUFFIX)" != x ; then \
		967	bfd_soversion="$${bfd_soversion}.$(EXTRA_SOVERSION_SUFFIX)" ;\
		968	fi ;\
964	$(SED) -e "s,@bfd_version@,$$bfd_version," \	969	$(SED) -e "s,@bfd_version@,$$bfd_version," \
965	-e "s,@bfd_version_string@,$$bfd_version_string," \	970	-e "s,@bfd_version_string@,$$bfd_version_string," \
966	-e "s,@bfd_version_package@,$$bfd_version_package," \	971	-e "s,@bfd_version_package@,$$bfd_version_package," \

Lines 317-322 ECHO_T = @ECHO_T@ Link Here

(-)a/bfd/Makefile.in (+4 lines)
317	EGREP = @EGREP@	317	EGREP = @EGREP@
318	EXEEXT = @EXEEXT@	318	EXEEXT = @EXEEXT@
319	EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@	319	EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
		320	EXTRA_SOVERSION_SUFFIX = @EXTRA_SOVERSION_SUFFIX@
320	FGREP = @FGREP@	321	FGREP = @FGREP@
321	GENCAT = @GENCAT@	322	GENCAT = @GENCAT@
322	GMSGFMT = @GMSGFMT@	323	GMSGFMT = @GMSGFMT@
Lines 2073-2078 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in Link Here
2073	bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\	2074	bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
2074	bfd_soversion="$(VERSION).$${bfd_version_date}" ;\	2075	bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
2075	fi ;\	2076	fi ;\
		2077	if test x"$(EXTRA_SOVERSION_SUFFIX)" != x ; then \
		2078	bfd_soversion="$${bfd_soversion}.$(EXTRA_SOVERSION_SUFFIX)" ;\
		2079	fi ;\
2076	$(SED) -e "s,@bfd_version@,$$bfd_version," \	2080	$(SED) -e "s,@bfd_version@,$$bfd_version," \
2077	-e "s,@bfd_version_string@,$$bfd_version_string," \	2081	-e "s,@bfd_version_string@,$$bfd_version_string," \
2078	-e "s,@bfd_version_package@,$$bfd_version_package," \	2082	-e "s,@bfd_version_package@,$$bfd_version_package," \

Lines 696-701 WARN_CFLAGS Link Here

(-)a/bfd/configure (+13 lines)
696	REPORT_BUGS_TEXI	696	REPORT_BUGS_TEXI
697	REPORT_BUGS_TO	697	REPORT_BUGS_TO
698	PKGVERSION	698	PKGVERSION
		699	EXTRA_SOVERSION_SUFFIX
699	DEBUGDIR	700	DEBUGDIR
700	PLUGINS_FALSE	701	PLUGINS_FALSE
701	PLUGINS_TRUE	702	PLUGINS_TRUE
Lines 833-838 enable_secureplt Link Here
833	enable_separate_code	834	enable_separate_code
834	enable_leading_mingw64_underscores	835	enable_leading_mingw64_underscores
835	with_separate_debug_dir	836	with_separate_debug_dir
		837	with_extra_soversion_suffix
836	with_pkgversion	838	with_pkgversion
837	with_bugurl	839	with_bugurl
838	enable_werror	840	enable_werror
Lines 1508-1513 Optional Packages: Link Here
1508	--with-separate-debug-dir=DIR	1510	--with-separate-debug-dir=DIR
1509	Look for global separate debug info in DIR	1511	Look for global separate debug info in DIR
1510	[[default=LIBDIR/debug]]	1512	[[default=LIBDIR/debug]]
		1513	--with-extra-soversion-suffix=SUFFIX
		1514	Append '.SUFFIX' to SONAME [default=]
1511	--with-pkgversion=PKG Use PKG in the version string in place of "GNU	1515	--with-pkgversion=PKG Use PKG in the version string in place of "GNU
1512	Binutils"	1516	Binutils"
1513	--with-bugurl=URL Direct users to URL to report a bug	1517	--with-bugurl=URL Direct users to URL to report a bug
Lines 12520-12525 fi Link Here
12520		12524
12521		12525
12522		12526
		12527	EXTRA_SOVERSION_SUFFIX=
		12528
		12529	# Check whether --with-extra-soversion-suffix was given.
		12530	if test "${with_extra_soversion_suffix+set}" = set; then :
		12531	withval=$with_extra_soversion_suffix; EXTRA_SOVERSION_SUFFIX="${withval}"
		12532	fi
		12533
		12534
		12535
12523		12536
12524		12537
12525	# Check whether --with-pkgversion was given.	12538	# Check whether --with-pkgversion was given.

Lines 137-142 AC_ARG_WITH(separate-debug-dir, Link Here

(-)a/bfd/configure.ac (-1 / +7 lines)
137	[DEBUGDIR="${withval}"])	137	[DEBUGDIR="${withval}"])
138	AC_SUBST(DEBUGDIR)	138	AC_SUBST(DEBUGDIR)
139		139
		140	EXTRA_SOVERSION_SUFFIX=
		141	AC_ARG_WITH(extra-soversion-suffix,
		142	AS_HELP_STRING([--with-extra-soversion-suffix=SUFFIX],
		143	[Append '.SUFFIX' to SONAME [[default=]]]),
		144	[EXTRA_SOVERSION_SUFFIX="${withval}"])
		145	AC_SUBST(EXTRA_SOVERSION_SUFFIX)
		146
140	ACX_PKGVERSION([GNU Binutils])	147	ACX_PKGVERSION([GNU Binutils])
141	ACX_BUGURL([http://www.sourceware.org/bugzilla/])	148	ACX_BUGURL([http://www.sourceware.org/bugzilla/])
142		149
143	-

Return to bug 666100