Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4677a
Modified Files:
configure configure.in makeopts.in makerules
Log Message:
use -fPIC for modules and libdspam (which is linked into a module) compilation,
otherwise the build fails under Linux on x86_64
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.328
retrieving revision 1.329
diff -b -u -2 -r1.328 -r1.329
--- configure 15 Dec 2005 19:40:03 -0000 1.328
+++ configure 3 May 2006 17:18:00 -0000 1.329
@@ -51,12 +51,12 @@
--with-ssl=ssldir specify path where OpenSSL is installed"
ac_help="$ac_help
- --with-wxdir=PATH Use uninstalled version of wxWindows in PATH"
+ --with-wxdir=PATH Use uninstalled version of wxWidgets in PATH"
ac_help="$ac_help
--with-wx-config=CONFIG wx-config script to use (optional)"
ac_help="$ac_help
- --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)"
+ --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)"
ac_help="$ac_help
--with-wx-exec-prefix=PREFIX
[...1347 lines suppressed...]
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5370,5 +5384,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c"
1>&6
-echo "configure:5373: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5387: checking whether ${CC} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_c_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5633,4 +5647,5 @@
[EMAIL PROTECTED]@%$WX_LIBS_STATIC%g
[EMAIL PROTECTED]@%$WX_VERSION%g
[EMAIL PROTECTED]@%$WX_RESCOMP%g
[EMAIL PROTECTED]@%$GUI_LIBS%g
[EMAIL PROTECTED]@%$GUI_LIBS_QUARTSTATIC%g
@@ -5645,4 +5660,5 @@
[EMAIL PROTECTED]@%$MAKE_USE_MODULES%g
[EMAIL PROTECTED]@%$MODULELDFLAGS%g
[EMAIL PROTECTED]@%$SHARED_CFLAGS%g
[EMAIL PROTECTED]@%$DOCHTML%g
[EMAIL PROTECTED]@%$DOCTEX%g
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.313
retrieving revision 1.314
diff -b -u -2 -r1.313 -r1.314
--- configure.in 15 Dec 2005 19:40:04 -0000 1.313
+++ configure.in 3 May 2006 17:18:01 -0000 1.314
@@ -1241,4 +1241,9 @@
if test "$m_cv_USE_MODULES" = "dynamic"; then
+ dnl modules need to be compiled as PIC
+ if test "$GCC" = "yes"; then
+ SHARED_CFLAGS="-fPIC"
+ fi
+
dnl under some systems we have to use -Wl,-export-dynamic or the
dnl modules don't find symbols in M
@@ -1252,4 +1257,5 @@
AC_SUBST(MAKE_USE_MODULES)
AC_SUBST(MODULELDFLAGS)
+AC_SUBST(SHARED_CFLAGS)
dnl --------------------------------------------------------------------------
Index: makeopts.in
===================================================================
RCS file: /cvsroot/mahogany/M/makeopts.in,v
retrieving revision 1.109
retrieving revision 1.110
diff -b -u -2 -r1.109 -r1.110
--- makeopts.in 8 Jul 2004 22:06:45 -0000 1.109
+++ makeopts.in 3 May 2006 17:18:01 -0000 1.110
@@ -135,4 +135,7 @@
# for the python code:
CXXFLAGS_RELAXED = @CXXFLAGS_RELAXED@
+
+# shared libraries options
+SHARED_CFLAGS := @SHARED_CFLAGS@
LDFLAGS = @LDFLAGS@ @MODULELDFLAGS@
Index: makerules
===================================================================
RCS file: /cvsroot/mahogany/M/makerules,v
retrieving revision 1.65
retrieving revision 1.66
diff -b -u -2 -r1.65 -r1.66
--- makerules 9 Apr 2005 19:15:49 -0000 1.65
+++ makerules 3 May 2006 17:18:01 -0000 1.66
@@ -89,5 +89,5 @@
# as a side-effect of building a .so file, any corresponding .o is removed
%.so: %.cpp
- $(CXX) -o $@ $(strip $(M_COMPILE_CXX) $< $(M_LD_FLAGS))
+ $(CXX) -o $@ $(SHARED_CFLAGS) $(strip $(M_COMPILE_CXX) $< $(M_LD_FLAGS))
@f=$(notdir $*); test ! -f $$f.d || { sed "s,^$$f\.o:,$@:," $$f.d >$*.o
&& rm -f $$f.d && mv $*.o $*.d; }
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
