Author: tross
Date: Wed Apr 27 17:02:40 2011
New Revision: 1097181
URL: http://svn.apache.org/viewvc?rev=1097181&view=rev
Log:
NO-JIRA - Build fixes for saslwrapper:
- Add -fno-strict-aliasing to the compile flags for the c++ wrapper code
- Ensure that the Python artifacts are installed in an arch-specific location
Modified:
qpid/trunk/qpid/extras/sasl/bootstrap
qpid/trunk/qpid/extras/sasl/configure.ac
qpid/trunk/qpid/extras/sasl/python/Makefile.am
qpid/trunk/qpid/extras/sasl/ruby/Makefile.am
qpid/trunk/qpid/extras/sasl/src/Makefile.am
Modified: qpid/trunk/qpid/extras/sasl/bootstrap
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/sasl/bootstrap?rev=1097181&r1=1097180&r2=1097181&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/sasl/bootstrap (original)
+++ qpid/trunk/qpid/extras/sasl/bootstrap Wed Apr 27 17:02:40 2011
@@ -22,7 +22,7 @@ aclocal -I m4
autoheader
libtoolize --automake
-automake
+automake --add-missing
autoconf
if [ "$1" = "-build" -o "$1" = "--build" ] ; then
Modified: qpid/trunk/qpid/extras/sasl/configure.ac
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/sasl/configure.ac?rev=1097181&r1=1097180&r2=1097181&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/sasl/configure.ac (original)
+++ qpid/trunk/qpid/extras/sasl/configure.ac Wed Apr 27 17:02:40 2011
@@ -23,7 +23,6 @@ AC_CONFIG_HEADERS([config.h])
AC_PROG_CC_STDC
AM_PROG_CC_C_O
AC_PROG_CXX
-AC_USE_SYSTEM_EXTENSIONS
AC_LANG([C++])
# Check for optional use of help2man
Modified: qpid/trunk/qpid/extras/sasl/python/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/sasl/python/Makefile.am?rev=1097181&r1=1097180&r2=1097181&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/sasl/python/Makefile.am (original)
+++ qpid/trunk/qpid/extras/sasl/python/Makefile.am Wed Apr 27 17:02:40 2011
@@ -29,8 +29,7 @@ BUILT_SOURCES = $(generated_file_list)
$(generated_file_list): python.i $(top_srcdir)/src/saslwrapper.i
$(SWIG) -c++ -python -Wall -I/usr/include $(INCLUDES) -o
saslwrapper.cpp $(srcdir)/python.i
-pylibdir = $(PYTHON_LIB)
-python_PYTHON = saslwrapper.py
+pyexec_PYTHON = saslwrapper.py
pyexec_LTLIBRARIES = _saslwrapper.la
_saslwrapper_la_LDFLAGS = -avoid-version -module -shared
Modified: qpid/trunk/qpid/extras/sasl/ruby/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/sasl/ruby/Makefile.am?rev=1097181&r1=1097180&r2=1097181&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/sasl/ruby/Makefile.am (original)
+++ qpid/trunk/qpid/extras/sasl/ruby/Makefile.am Wed Apr 27 17:02:40 2011
@@ -35,7 +35,7 @@ rubylibarch_LTLIBRARIES = saslwrapper.la
saslwrapper_la_LDFLAGS = -avoid-version -module -shared ".$(RUBY_DLEXT)"
saslwrapper_la_LIBADD = $(RUBY_LIBS) $(top_builddir)/src/libsaslwrapper.la
-lsasl2
-saslwrapper_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH)
+saslwrapper_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH)
-fno-strict-aliasing
nodist_saslwrapper_la_SOURCES = saslwrapper.cpp
CLEANFILES = $(generated_file_list)
Modified: qpid/trunk/qpid/extras/sasl/src/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/sasl/src/Makefile.am?rev=1097181&r1=1097180&r2=1097181&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/sasl/src/Makefile.am (original)
+++ qpid/trunk/qpid/extras/sasl/src/Makefile.am Wed Apr 27 17:02:40 2011
@@ -24,6 +24,7 @@ nobase_include_HEADERS = ../include/sasl
lib_LTLIBRARIES = libsaslwrapper.la
libsaslwrapper_la_SOURCES = cyrus/saslwrapper.cpp
+libsaslwrapper_la_CXXFLAGS = -fno-strict-aliasing
# Library Version Information:
#
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
