Donn Cave <donn@oz.net>:
Update for BeOS. This closes SourceForge patch #101774. Also fix typo in a comment.
This commit is contained in:
parent
a2cb78f1e8
commit
5790be1a4d
49
configure.in
49
configure.in
|
@ -117,19 +117,12 @@ AC_ARG_WITH(gcc, [ --without-gcc never use gcc], [
|
||||||
OSF1) CC=cc
|
OSF1) CC=cc
|
||||||
without_gcc=;;
|
without_gcc=;;
|
||||||
BeOS*)
|
BeOS*)
|
||||||
# Dunno if it's a good idea to get this over with all at once, or
|
|
||||||
# to handle it in with the other goodies.
|
|
||||||
MACHDEP=beos
|
|
||||||
|
|
||||||
case $BE_HOST_CPU in
|
case $BE_HOST_CPU in
|
||||||
ppc)
|
ppc)
|
||||||
CC="mwcc -I$PWD/BeOS -nodup"
|
CC=mwcc
|
||||||
without_gcc=yes
|
without_gcc=yes
|
||||||
case `uname -r` in
|
OPT="-O -D'DL_EXPORT(RTYPE)=__declspec(dllexport) RTYPE' -D'DL_IMPORT(RTYPE)=__declspec(dllexport) RTYPE' -export pragma"
|
||||||
4.0*) OPT="-DUSE_DL_EXPORT -O7 -opt schedule604 -export pragma" ;;
|
CCSHARED="UDL_IMPORT -D'DL_IMPORT(RTYPE)=__declspec(dllimport) RTYPE'"
|
||||||
*) OPT="-DUSE_DL_EXPORT -O2 -proc 604e -export pragma" ;;
|
|
||||||
esac
|
|
||||||
CCSHARED=-UUSE_DL_EXPORT
|
|
||||||
LDFLAGS="$LDFLAGS -nodup"
|
LDFLAGS="$LDFLAGS -nodup"
|
||||||
|
|
||||||
AR="$PWD/BeOS/ar-fake"
|
AR="$PWD/BeOS/ar-fake"
|
||||||
|
@ -138,18 +131,15 @@ AC_ARG_WITH(gcc, [ --without-gcc never use gcc], [
|
||||||
AC_DEFINE(DL_EXPORT_HEADER,"dl_export.h")
|
AC_DEFINE(DL_EXPORT_HEADER,"dl_export.h")
|
||||||
;;
|
;;
|
||||||
x86)
|
x86)
|
||||||
CC="gcc -I$PWD/BeOS"
|
CC=gcc
|
||||||
without_gcc=no
|
without_gcc=no
|
||||||
OPT="-DUSE_DL_EXPORT -O"
|
OPT=-O
|
||||||
CCSHARED=-UUSE_DL_EXPORT
|
# Really should use srcdir instead of PWD
|
||||||
|
|
||||||
AR="$PWD/BeOS/ar-fake"
|
AR="$PWD/BeOS/ar-fake"
|
||||||
RANLIB=:
|
RANLIB=:
|
||||||
|
|
||||||
AC_DEFINE(DL_EXPORT_HEADER,"dl_export.h")
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_ERROR(Your BeOS system isn't PowerPC or x86... neat, but this won't work...)
|
AC_ERROR(Unknown BeOS platform \"$BE_HOST_CPU\")
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
@ -220,10 +210,6 @@ hp*|HP*)
|
||||||
case $CC in
|
case $CC in
|
||||||
cc|*/cc) CC="$CC -Ae";;
|
cc|*/cc) CC="$CC -Ae";;
|
||||||
esac;;
|
esac;;
|
||||||
BeOS*)
|
|
||||||
case $CC in
|
|
||||||
cc) CC=cc;;
|
|
||||||
esac;;
|
|
||||||
Monterey*)
|
Monterey*)
|
||||||
case $CC in
|
case $CC in
|
||||||
cc) CC="$CC -Wl,-Bexport";;
|
cc) CC="$CC -Wl,-Bexport";;
|
||||||
|
@ -239,7 +225,7 @@ AC_SUBST(LDLIBRARY)
|
||||||
LDLIBRARY=''
|
LDLIBRARY=''
|
||||||
|
|
||||||
# LINKCC is the command that links the python executable -- default is $(CC).
|
# LINKCC is the command that links the python executable -- default is $(CC).
|
||||||
# This is altered for AIX and BeOS in order to build the export list before
|
# This is altered for AIX in order to build the export list before
|
||||||
# linking.
|
# linking.
|
||||||
AC_SUBST(LINKCC)
|
AC_SUBST(LINKCC)
|
||||||
AC_MSG_CHECKING(LINKCC)
|
AC_MSG_CHECKING(LINKCC)
|
||||||
|
@ -252,9 +238,6 @@ then
|
||||||
case $ac_sys_system in
|
case $ac_sys_system in
|
||||||
AIX*)
|
AIX*)
|
||||||
LINKCC="\$(srcdir)/makexp_aix python.exp \"\" \$(LIBRARY); \$(PURIFY) \$(CC)";;
|
LINKCC="\$(srcdir)/makexp_aix python.exp \"\" \$(LIBRARY); \$(PURIFY) \$(CC)";;
|
||||||
BeOS*)
|
|
||||||
LINKCC="\$(srcdir)/../BeOS/linkcc \$(LIBRARY) \$(PURIFY) \$(CC) \$(OPT)"
|
|
||||||
LDLIBRARY='libpython$(VERSION).so';;
|
|
||||||
dgux*)
|
dgux*)
|
||||||
LINKCC="LD_RUN_PATH=$libdir \$(PURIFY) \$(CC)";;
|
LINKCC="LD_RUN_PATH=$libdir \$(PURIFY) \$(CC)";;
|
||||||
Monterey64*)
|
Monterey64*)
|
||||||
|
@ -274,11 +257,15 @@ then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# DG/UX requires some fancy ld contortions to produce a .so from an .a
|
# DG/UX requires some fancy ld contortions to produce a .so from an .a
|
||||||
if test "$MACHDEP" = "dguxR4"
|
case $MACHDEP in
|
||||||
then
|
dguxR4)
|
||||||
LDLIBRARY='libpython$(VERSION).so'
|
LDLIBRARY='libpython$(VERSION).so'
|
||||||
OPT="$OPT -pic"
|
OPT="$OPT -pic"
|
||||||
fi
|
;;
|
||||||
|
beos*)
|
||||||
|
LDLIBRARY='libpython$(VERSION).so'
|
||||||
|
;;
|
||||||
|
esac
|
||||||
AC_MSG_RESULT($LDLIBRARY)
|
AC_MSG_RESULT($LDLIBRARY)
|
||||||
|
|
||||||
# If LDLIBRARY is different from LIBRARY, emit a rule to build it.
|
# If LDLIBRARY is different from LIBRARY, emit a rule to build it.
|
||||||
|
@ -841,7 +828,7 @@ then
|
||||||
then with_libdb="yes"
|
then with_libdb="yes"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# make sure user knows why bsddb support wasn't enabled event
|
# make sure user knows why bsddb support wasn't enabled even
|
||||||
# though s/he requested it
|
# though s/he requested it
|
||||||
if test "$with_libdb" = "yes"
|
if test "$with_libdb" = "yes"
|
||||||
then echo $ac_n "(requested, but db.h was not found) $ac_c"
|
then echo $ac_n "(requested, but db.h was not found) $ac_c"
|
||||||
|
|
Loading…
Reference in New Issue