You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by gr...@apache.org on 2002/12/17 21:44:04 UTC
cvs commit: httpd-python/test test.py
grisha 2002/12/17 12:44:04
Modified: . configure configure.in
src Makefile.in
test test.py
Log:
Added _muldi3.o to list of objects to be explicitely linked in on Sol 8.
I haven't seen a problem with it, but Michael Schwager reported seeing it,
and it didn't seem to hurt anything to add it.
Revision Changes Path
1.25 +16 -19 httpd-python/configure
Index: configure
===================================================================
RCS file: /home/cvs/httpd-python/configure,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- configure 17 Dec 2002 20:32:58 -0000 1.24
+++ configure 17 Dec 2002 20:44:03 -0000 1.25
@@ -1115,7 +1115,6 @@
-
if test -z "$APXS"; then
echo "configure: warning: **** apxs was not found, DSO compilation will not be available." 1>&2
echo "configure: warning: **** You can use --with-apxs to specify where your apxs is." 1>&2
@@ -1127,7 +1126,7 @@
# check Apache version
echo $ac_n "checking Apache version""... $ac_c" 1>&6
-echo "configure:1131: checking Apache version" >&5
+echo "configure:1130: checking Apache version" >&5
HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
ver=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
echo "$ac_t""$ver" 1>&6
@@ -1139,22 +1138,21 @@
# determine LIBEXEC
echo $ac_n "checking for Apache libexec directory""... $ac_c" 1>&6
-echo "configure:1143: checking for Apache libexec directory" >&5
+echo "configure:1142: checking for Apache libexec directory" >&5
LIBEXECDIR=`${APXS} -q LIBEXECDIR`
echo "$ac_t""$LIBEXECDIR" 1>&6
# determine INCLUDES
echo $ac_n "checking for Apache include directory""... $ac_c" 1>&6
-echo "configure:1149: checking for Apache include directory" >&5
+echo "configure:1148: checking for Apache include directory" >&5
AP_INCLUDES="-I`${APXS} -q INCLUDEDIR`"
echo "$ac_t""$AP_INCLUDES" 1>&6
if test "`uname`" = "SunOS"; then
echo $ac_n "checking for gcc on Solaris possible missing _eprintf problem""... $ac_c" 1>&6
-echo "configure:1155: checking for gcc on Solaris possible missing _eprintf problem" >&5
+echo "configure:1154: checking for gcc on Solaris possible missing _eprintf problem" >&5
if test "$CC" = "gcc"; then
- EPRINTF_HACK="_eprintf.o"
- FLOATDIDF_HACK="_floatdidf.o"
+ SOLARIS_HACKS="_eprintf.o _floatdidf.o _muldi3.o"
fi
echo "$ac_t"""done"" 1>&6
fi
@@ -1207,7 +1205,7 @@
fi
echo $ac_n "checking for --with-python""... $ac_c" 1>&6
-echo "configure:1211: checking for --with-python" >&5
+echo "configure:1209: checking for --with-python" >&5
# Check whether --with-python or --without-python was given.
if test "${with_python+set}" = set; then
withval="$with_python"
@@ -1226,7 +1224,7 @@
# Extract the first word of "python", so it can be a program name with args.
set dummy python; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1230: checking for $ac_word" >&5
+echo "configure:1228: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PYTHON_BIN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1265,7 +1263,7 @@
# find out python version
echo $ac_n "checking Python version""... $ac_c" 1>&6
-echo "configure:1269: checking Python version" >&5
+echo "configure:1267: checking Python version" >&5
PyVERSION=`$PYTHON_BIN -c 'import sys; print sys.version[:3]'`
PyMAJVERSION=`$PYTHON_BIN -c 'import sys; print sys.version[:1]'`
echo "$ac_t""$PyVERSION" 1>&6
@@ -1277,7 +1275,7 @@
# find out compiled in install prefix
echo $ac_n "checking Python install prefix""... $ac_c" 1>&6
-echo "configure:1281: checking Python install prefix" >&5
+echo "configure:1279: checking Python install prefix" >&5
PyEXEC_INSTALLDIR=`$PYTHON_BIN -c "import sys; print sys.exec_prefix"`
echo "$ac_t""$PyEXEC_INSTALLDIR" 1>&6
@@ -1305,7 +1303,7 @@
else
LDFLAGS="${LDFLAGS} -L${PyLIBPL}"
echo $ac_n "checking for Py_NewInterpreter in -lpython${PyVERSION}""... $ac_c" 1>&6
-echo "configure:1309: checking for Py_NewInterpreter in -lpython${PyVERSION}" >&5
+echo "configure:1307: checking for Py_NewInterpreter in -lpython${PyVERSION}" >&5
ac_lib_var=`echo python${PyVERSION}'_'Py_NewInterpreter | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1313,7 +1311,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpython${PyVERSION} ${PyLIBS} ${PyMODLIBS} $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1317 "configure"
+#line 1315 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1324,7 +1322,7 @@
Py_NewInterpreter()
; return 0; }
EOF
-if { (eval echo configure:1328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1356,7 +1354,7 @@
# (actually this check already just happened above)
echo $ac_n "checking what libraries Python was linked with""... $ac_c" 1>&6
-echo "configure:1360: checking what libraries Python was linked with" >&5
+echo "configure:1358: checking what libraries Python was linked with" >&5
PY_LIBS="${PyPYTHONLIBS} ${PyLIBS} ${PyMODLIBS}"
## XXX this is a small work around for a weird RedHat problem
@@ -1369,7 +1367,7 @@
echo "$ac_t""$PY_LIBS" 1>&6
echo $ac_n "checking linker flags used to link Python""... $ac_c" 1>&6
-echo "configure:1373: checking linker flags used to link Python" >&5
+echo "configure:1371: checking linker flags used to link Python" >&5
PyLFS=`grep "^LINKFORSHARED=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
@@ -1378,7 +1376,7 @@
echo "$ac_t""$PY_LDFLAGS" 1>&6
echo $ac_n "checking where Python include files are""... $ac_c" 1>&6
-echo "configure:1382: checking where Python include files are" >&5
+echo "configure:1380: checking where Python include files are" >&5
PY_INCLUDES="-I${PyEXEC_INSTALLDIR}/include/python${PyVERSION}"
INCLUDES="${INCLUDES} ${AP_INCLUDES} ${PY_INCLUDES}"
@@ -1545,8 +1543,7 @@
s%@DSO@%$DSO%g
s%@ALL@%$ALL%g
s%@LIBEXECDIR@%$LIBEXECDIR%g
-s%@EPRINTF_HACK@%$EPRINTF_HACK%g
-s%@FLOATDIDF_HACK@%$FLOATDIDF_HACK%g
+s%@SOLARIS_HACKS@%$SOLARIS_HACKS%g
s%@HTTPD@%$HTTPD%g
s%@AP_SRC@%$AP_SRC%g
s%@AP_SRC_OWN@%$AP_SRC_OWN%g
1.29 +2 -4 httpd-python/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-python/configure.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- configure.in 17 Dec 2002 20:32:58 -0000 1.28
+++ configure.in 17 Dec 2002 20:44:03 -0000 1.29
@@ -124,8 +124,7 @@
# if apxs was still not found, then no DSO
AC_SUBST(LIBEXECDIR)
-AC_SUBST(EPRINTF_HACK)
-AC_SUBST(FLOATDIDF_HACK)
+AC_SUBST(SOLARIS_HACKS)
AC_SUBST(HTTPD)
if test -z "$APXS"; then
AC_MSG_WARN([**** apxs was not found, DSO compilation will not be available.])
@@ -161,8 +160,7 @@
if test "`uname`" = "SunOS"; then
AC_MSG_CHECKING([for gcc on Solaris possible missing _eprintf problem])
if test "$CC" = "gcc"; then
- EPRINTF_HACK="_eprintf.o"
- FLOATDIDF_HACK="_floatdidf.o"
+ SOLARIS_HACKS="_eprintf.o _floatdidf.o _muldi3.o"
fi
AC_MSG_RESULT("done")
fi
1.26 +6 -3 httpd-python/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-python/src/Makefile.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.in 8 Nov 2002 00:15:11 -0000 1.25
+++ Makefile.in 17 Dec 2002 20:44:04 -0000 1.26
@@ -75,11 +75,11 @@
dso: mod_python.so
@echo dso > .install
-mod_python.so: $(SRCS) @EPRINTF_HACK@ @FLOATDIDF_HACK@
+mod_python.so: $(SRCS) @SOLARIS_HACKS@
@echo
@echo 'Compiling for DSO. For static, do "make static"'
@echo
- $(APXS) $(INCLUDES) -c $(SRCS) $(LDFLAGS) $(LIBS) @EPRINTF_HACK@ @FLOATDIDF_HACK@
+ $(APXS) $(INCLUDES) -c $(SRCS) $(LDFLAGS) $(LIBS) @SOLARIS_HACKS@
@rm -f mod_python.so
@ln -s .libs/mod_python.so
@echo
@@ -95,10 +95,13 @@
rm -f Makefile .depend .install
# this is a hack to help avoid a gcc/solaris problem
-# python uses assert() which needs _eprintf()
+# python uses assert() which needs _eprintf(). See
+# SOLARIS_HACKS above
_eprintf.o:
ar -x `gcc -print-libgcc-file-name` _eprintf.o
_floatdidf.o:
ar -x `gcc -print-libgcc-file-name` _floatdidf.o
+_muldi3.o:
+ ar -x `gcc -print-libgcc-file-name` _muldi3.o
# DO NOT DELETE THIS LINE
1.22 +2 -2 httpd-python/test/test.py
Index: test.py
===================================================================
RCS file: /home/cvs/httpd-python/test/test.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- test.py 2 Dec 2002 21:53:11 -0000 1.21
+++ test.py 17 Dec 2002 20:44:04 -0000 1.22
@@ -796,7 +796,7 @@
self.stopHttpd()
# see what's in the log now
- time.sleep(1)
+ time.sleep(2)
f = open(os.path.join(SERVER_ROOT, "logs/error_log"))
log = f.read()
f.close()