BIND 10 master, updated. 51b3f091d6a750ad4a65825c4f36bb7c05dddbcb bug #1728: Add -avoid-version in some more places
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Mar 22 13:04:25 UTC 2012
The branch, master has been updated
via 51b3f091d6a750ad4a65825c4f36bb7c05dddbcb (commit)
via 652ae9e92f8c08cab84f603b8b6119afa23c8441 (commit)
via ba9dcb416a6170c8b4174f5353e3ff9b12a4bf66 (commit)
via c6d6f765fa9faf89c5159374f3ad60066e7e4ccc (commit)
via 927397a7699daae124085d2ddbdfba9af5c06f8c (commit)
from 54c1a257f7c93d1249f8bc7bdfb69d72c323d1d4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 51b3f091d6a750ad4a65825c4f36bb7c05dddbcb
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Mar 22 16:40:08 2012 +0530
bug #1728: Add -avoid-version in some more places
commit 652ae9e92f8c08cab84f603b8b6119afa23c8441
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Mar 22 15:56:23 2012 +0530
bug #1728: Set LD_LIBRARY_PATH on OpenBSD as well
commit ba9dcb416a6170c8b4174f5353e3ff9b12a4bf66
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Mar 20 01:34:48 2012 +0530
master: Fix AC_LANG_SOURCE warnings from automake
commit c6d6f765fa9faf89c5159374f3ad60066e7e4ccc
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Mar 20 01:29:11 2012 +0530
bug #1728: Add -avoid-version to LDFLAGS for Python modules (contd.)
commit 927397a7699daae124085d2ddbdfba9af5c06f8c
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Mar 20 01:20:40 2012 +0530
bug #1728: Add -avoid-version to LDFLAGS for Python modules
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 5 ++++-
src/lib/datasrc/Makefile.am | 4 ++--
src/lib/dns/python/Makefile.am | 2 +-
src/lib/python/isc/acl/Makefile.am | 4 ++--
src/lib/python/isc/datasrc/Makefile.am | 2 +-
src/lib/python/isc/log/Makefile.am | 2 +-
src/lib/python/isc/util/cio/Makefile.am | 2 +-
src/lib/util/io/Makefile.am | 2 +-
src/lib/util/pyunittests/Makefile.am | 2 +-
9 files changed, 14 insertions(+), 11 deletions(-)
-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index f169397..6e3b9d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,6 +123,9 @@ case "$host" in
*-netbsd*)
SET_ENV_LIBRARY_PATH=yes
;;
+*-openbsd*)
+ SET_ENV_LIBRARY_PATH=yes
+ ;;
esac
AM_CONDITIONAL(SET_ENV_LIBRARY_PATH, test $SET_ENV_LIBRARY_PATH = yes)
AC_SUBST(SET_ENV_LIBRARY_PATH)
@@ -270,7 +273,7 @@ AC_DEFUN([BIND10_CXX_TRY_FLAG], [
bind10_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $1"
- AC_LINK_IFELSE([int main(void){ return 0;}],
+ AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void){ return 0;}])],
[bind10_cxx_flag=yes], [bind10_cxx_flag=no])
CXXFLAGS="$bind10_save_CXXFLAGS"
diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am
index dde3a82..1e743dd 100644
--- a/src/lib/datasrc/Makefile.am
+++ b/src/lib/datasrc/Makefile.am
@@ -36,7 +36,7 @@ pkglib_LTLIBRARIES = sqlite3_ds.la memory_ds.la
sqlite3_ds_la_SOURCES = sqlite3_accessor.h sqlite3_accessor.cc
sqlite3_ds_la_SOURCES += sqlite3_accessor_link.cc
-sqlite3_ds_la_LDFLAGS = -module
+sqlite3_ds_la_LDFLAGS = -module -avoid-version
sqlite3_ds_la_LDFLAGS += -no-undefined -version-info 1:0:0
sqlite3_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
sqlite3_ds_la_LIBADD += libdatasrc.la
@@ -44,7 +44,7 @@ sqlite3_ds_la_LIBADD += $(SQLITE_LIBS)
memory_ds_la_SOURCES = memory_datasrc.h memory_datasrc.cc
memory_ds_la_SOURCES += memory_datasrc_link.cc
-memory_ds_la_LDFLAGS = -module
+memory_ds_la_LDFLAGS = -module -avoid-version
memory_ds_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
memory_ds_la_LIBADD += libdatasrc.la
diff --git a/src/lib/dns/python/Makefile.am b/src/lib/dns/python/Makefile.am
index 780b464..2846659 100644
--- a/src/lib/dns/python/Makefile.am
+++ b/src/lib/dns/python/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_DIST += nsec3hash_python_inc.cc
# Python prefers .so, while some OSes (specifically MacOS) use a different
# suffix for dynamic objects. -module is necessary to work this around.
-pydnspp_la_LDFLAGS += -module
+pydnspp_la_LDFLAGS += -module -avoid-version
pydnspp_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la
pydnspp_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
pydnspp_la_LIBADD += libpydnspp.la
diff --git a/src/lib/python/isc/acl/Makefile.am b/src/lib/python/isc/acl/Makefile.am
index b1afa15..b9a0c81 100644
--- a/src/lib/python/isc/acl/Makefile.am
+++ b/src/lib/python/isc/acl/Makefile.am
@@ -26,11 +26,11 @@ _dns_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
# Python prefers .so, while some OSes (specifically MacOS) use a different
# suffix for dynamic objects. -module is necessary to work this around.
-acl_la_LDFLAGS += -module
+acl_la_LDFLAGS += -module -avoid-version
acl_la_LIBADD = $(top_builddir)/src/lib/acl/libacl.la
acl_la_LIBADD += $(PYTHON_LIB)
-_dns_la_LDFLAGS += -module
+_dns_la_LDFLAGS += -module -avoid-version
_dns_la_LIBADD = $(top_builddir)/src/lib/acl/libdnsacl.la
_dns_la_LIBADD += $(PYTHON_LIB)
diff --git a/src/lib/python/isc/datasrc/Makefile.am b/src/lib/python/isc/datasrc/Makefile.am
index 47f3dbc..1d862db 100644
--- a/src/lib/python/isc/datasrc/Makefile.am
+++ b/src/lib/python/isc/datasrc/Makefile.am
@@ -22,7 +22,7 @@ datasrc_la_SOURCES += journal_reader_python.cc journal_reader_python.h
datasrc_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
datasrc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
datasrc_la_LDFLAGS = $(PYTHON_LDFLAGS)
-datasrc_la_LDFLAGS += -module
+datasrc_la_LDFLAGS += -module -avoid-version
datasrc_la_LIBADD = $(top_builddir)/src/lib/datasrc/libdatasrc.la
datasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
datasrc_la_LIBADD += $(top_builddir)/src/lib/dns/python/libpydnspp.la
diff --git a/src/lib/python/isc/log/Makefile.am b/src/lib/python/isc/log/Makefile.am
index b228caf..3658c17 100644
--- a/src/lib/python/isc/log/Makefile.am
+++ b/src/lib/python/isc/log/Makefile.am
@@ -13,7 +13,7 @@ log_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
# placed after -Wextra defined in AM_CXXFLAGS
log_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
log_la_LDFLAGS = $(PYTHON_LDFLAGS)
-log_la_LDFLAGS += -module
+log_la_LDFLAGS += -module -avoid-version
log_la_LIBADD = $(top_builddir)/src/lib/log/liblog.la
log_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
log_la_LIBADD += $(top_builddir)/src/lib/config/libcfgclient.la
diff --git a/src/lib/python/isc/util/cio/Makefile.am b/src/lib/python/isc/util/cio/Makefile.am
index 7e00768..0a2e735 100644
--- a/src/lib/python/isc/util/cio/Makefile.am
+++ b/src/lib/python/isc/util/cio/Makefile.am
@@ -23,7 +23,7 @@ socketsession_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
# Python prefers .so, while some OSes (specifically MacOS) use a different
# suffix for dynamic objects. -module is necessary to work this around.
-socketsession_la_LDFLAGS += -module
+socketsession_la_LDFLAGS += -module -avoid-version
socketsession_la_LIBADD = $(top_builddir)/src/lib/util/io/libutil_io.la
socketsession_la_LIBADD += $(PYTHON_LIB)
diff --git a/src/lib/util/io/Makefile.am b/src/lib/util/io/Makefile.am
index 96b9d25..2c3ed96 100644
--- a/src/lib/util/io/Makefile.am
+++ b/src/lib/util/io/Makefile.am
@@ -13,7 +13,7 @@ CLEANFILES = *.gcno *.gcda
pyexec_LTLIBRARIES = libutil_io_python.la
# Python prefers .so, while some OSes (specifically MacOS) use a different
# suffix for dynamic objects. -module is necessary to work this around.
-libutil_io_python_la_LDFLAGS = -module
+libutil_io_python_la_LDFLAGS = -module -avoid-version
libutil_io_python_la_SOURCES = fdshare_python.cc
libutil_io_python_la_LIBADD = libutil_io.la
libutil_io_python_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
diff --git a/src/lib/util/pyunittests/Makefile.am b/src/lib/util/pyunittests/Makefile.am
index dd2d39a..93b0748 100644
--- a/src/lib/util/pyunittests/Makefile.am
+++ b/src/lib/util/pyunittests/Makefile.am
@@ -13,7 +13,7 @@ pyunittests_util_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
# Python prefers .so, while some OSes (specifically MacOS) use a different
# suffix for dynamic objects. -module is necessary to work this around.
-pyunittests_util_la_LDFLAGS += -module
+pyunittests_util_la_LDFLAGS += -module -avoid-version
pyunittests_util_la_LIBADD = $(top_builddir)/src/lib/util/libutil.la
pyunittests_util_la_LIBADD += $(PYTHON_LIB)
More information about the bind10-changes
mailing list