From 2b0add3a1a9cf83dd00b8bde2db75bc9c17d7ca9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 29 Mar 2006 14:34:12 +0000 Subject: boost 1.33.0: make it compile w/ linux-gnueabi --- packages/boost/boost_1.33.0.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb index 2c81f37899..db30f95a69 100644 --- a/packages/boost/boost_1.33.0.bb +++ b/packages/boost/boost_1.33.0.bb @@ -10,7 +10,7 @@ SECTION = "libs" DEPENDS = "boost-jam-native zlib" PRIORITY = "optional" LICENSE = "Boost Software License" -PR = "r0" +PR = "r1" # need debian package naming for the libs inherit debian @@ -128,6 +128,10 @@ BJAM_OPTS = '${BJAM_TOOLS} \ ${BJAM_EXTRA}' +do_configure_prepend() { + cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp +} + do_compile() { set -ex bjam ${BJAM_OPTS} --prefix=${prefix} \ -- cgit v1.2.3 From 689e31831953d5e817525447664c915f0b1377e1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 30 Mar 2006 14:11:45 +0000 Subject: qt-x11-free: upgrade to 3.3.6 and 4.1.1 respectively --- packages/qt/qt-x11-free-4.0.1/.mtn2git_empty | 0 packages/qt/qt-x11-free-4.0.1/cross-compile.patch | 128 --------------------- .../fix-resinit-declaration.patch | 16 --- packages/qt/qt-x11-free-4.0.1/no-tools.patch | 16 --- packages/qt/qt-x11-free-4.1.1/.mtn2git_empty | 0 packages/qt/qt-x11-free-4.1.1/cross-compile.patch | 128 +++++++++++++++++++++ .../fix-resinit-declaration.patch | 16 +++ packages/qt/qt-x11-free-4.1.1/no-tools.patch | 16 +++ packages/qt/qt-x11-free/gcc4_1-HACK.patch | 28 +++++ packages/qt/qt-x11-free_3.3.5.bb | 89 -------------- packages/qt/qt-x11-free_3.3.6.bb | 90 +++++++++++++++ packages/qt/qt-x11-free_4.0.1.bb | 117 ------------------- packages/qt/qt-x11-free_4.1.1.bb | 117 +++++++++++++++++++ 13 files changed, 395 insertions(+), 366 deletions(-) delete mode 100644 packages/qt/qt-x11-free-4.0.1/.mtn2git_empty delete mode 100644 packages/qt/qt-x11-free-4.0.1/cross-compile.patch delete mode 100644 packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch delete mode 100644 packages/qt/qt-x11-free-4.0.1/no-tools.patch create mode 100644 packages/qt/qt-x11-free-4.1.1/.mtn2git_empty create mode 100644 packages/qt/qt-x11-free-4.1.1/cross-compile.patch create mode 100644 packages/qt/qt-x11-free-4.1.1/fix-resinit-declaration.patch create mode 100644 packages/qt/qt-x11-free-4.1.1/no-tools.patch create mode 100644 packages/qt/qt-x11-free/gcc4_1-HACK.patch delete mode 100644 packages/qt/qt-x11-free_3.3.5.bb create mode 100644 packages/qt/qt-x11-free_3.3.6.bb delete mode 100644 packages/qt/qt-x11-free_4.0.1.bb create mode 100644 packages/qt/qt-x11-free_4.1.1.bb (limited to 'packages') diff --git a/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty b/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qt/qt-x11-free-4.0.1/cross-compile.patch b/packages/qt/qt-x11-free-4.0.1/cross-compile.patch deleted file mode 100644 index 39d095d7a0..0000000000 --- a/packages/qt/qt-x11-free-4.0.1/cross-compile.patch +++ /dev/null @@ -1,128 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-x11-opensource-src-4.0.1/configure~cross-compile -+++ qt-x11-opensource-src-4.0.1/configure -@@ -477,7 +477,7 @@ - UNKNOWN_ARG=yes - fi - ;; -- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey) -+ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-crossarch) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL=$1 -@@ -768,6 +768,9 @@ - xplatform) - XPLATFORM="$VAL" - ;; -+ crossarch) -+ CROSSARCH="$VAL" -+ ;; - debug-and-release) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_DEBUG_RELEASE="$VAL" -@@ -1649,100 +1652,7 @@ - echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)" - fi - --if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then -- case "$CFG_EMBEDDED" in -- x86) -- ARCH=i386 -- ;; -- ipaq|sharp) -- ARCH=arm -- ;; -- *) -- ARCH="$CFG_EMBEDDED" -- ;; -- esac --else -- case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in -- IRIX*:*:*) -- ARCH=`uname -p` -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " SGI ($ARCH)" -- fi -- ;; -- SunOS:5*:sun4*) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " Sun SPARC (sparc)" -- fi -- ARCH=sparc -- ;; -- Darwin:*:Power?Macintosh) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32-bit Apple PowerPC (powerpc)" -- fi -- ARCH=powerpc -- ;; -- Darwin:*:x86) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32-bit Apple Intel (x86)" -- fi -- ARCH=i386 -- ;; -- AIX:*:00????????00) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 64-bit IBM PowerPC (powerpc)" -- fi -- ARCH=powerpc -- ;; -- HP-UX:*:9000*) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " HP PA-RISC (parisc)" -- fi -- ARCH=parisc -- ;; -- *:*:i?86) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32-bit Intel 80x86 (i386)" -- fi -- ARCH=i386 -- ;; -- *:*:x86_64) -- if [ "$PLATFORM" = "linux-g++-32" ]; then -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32 bit on 64-bit AMD 80x86 (i386)" -- fi -- ARCH=i386 -- else -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 64-bit AMD 80x86 (x86_64)" -- fi -- ARCH=x86_64 -- fi -- ;; -- *:*:ppc) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32-bit PowerPC (powerpc)" -- fi -- ARCH=powerpc -- ;; -- *:*:*) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " Trying '$UNAME_MACHINE'..." -- fi -- ARCH="$UNAME_MACHINE" -- ;; -- esac --fi -- --if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " '$ARCH' is supported" -- fi --else -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " '$ARCH' is unsupported, using 'generic'" -- fi -- ARCH=generic --fi -+ARCH="$CROSSARCH" - - if [ "$OPT_VERBOSE" = "yes" ]; then - echo "System architecture: '$ARCH'" diff --git a/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch b/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch deleted file mode 100644 index bc30cab216..0000000000 --- a/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-x11-opensource-src-4.0.1/src/qt3support/network/q3dns.cpp~fix-resinit-declaration -+++ qt-x11-opensource-src-4.0.1/src/qt3support/network/q3dns.cpp -@@ -30,7 +30,7 @@ - # include - # include - # include --extern "C" int res_init(); -+extern "C" int res_init() throw (); - #endif - - // POSIX Large File Support redefines open -> open64 diff --git a/packages/qt/qt-x11-free-4.0.1/no-tools.patch b/packages/qt/qt-x11-free-4.0.1/no-tools.patch deleted file mode 100644 index 75a146a838..0000000000 --- a/packages/qt/qt-x11-free-4.0.1/no-tools.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-x11-opensource-src-4.0.1/src/src.pro~no-tools -+++ qt-x11-opensource-src-4.0.1/src/src.pro -@@ -3,7 +3,7 @@ - - # this order is important - win32:SUBDIRS += winmain --SUBDIRS += tools/moc tools/rcc tools/uic corelib xml gui sql network -+SUBDIRS += corelib xml gui sql network - !embedded:contains(QT_CONFIG, opengl): SUBDIRS += opengl - contains(QT_CONFIG, qt3support): SUBDIRS += qt3support - !cross_compile { diff --git a/packages/qt/qt-x11-free-4.1.1/.mtn2git_empty b/packages/qt/qt-x11-free-4.1.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qt/qt-x11-free-4.1.1/cross-compile.patch b/packages/qt/qt-x11-free-4.1.1/cross-compile.patch new file mode 100644 index 0000000000..39d095d7a0 --- /dev/null +++ b/packages/qt/qt-x11-free-4.1.1/cross-compile.patch @@ -0,0 +1,128 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.0.1/configure~cross-compile ++++ qt-x11-opensource-src-4.0.1/configure +@@ -477,7 +477,7 @@ + UNKNOWN_ARG=yes + fi + ;; +- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey) ++ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-crossarch) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL=$1 +@@ -768,6 +768,9 @@ + xplatform) + XPLATFORM="$VAL" + ;; ++ crossarch) ++ CROSSARCH="$VAL" ++ ;; + debug-and-release) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_DEBUG_RELEASE="$VAL" +@@ -1649,100 +1652,7 @@ + echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)" + fi + +-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then +- case "$CFG_EMBEDDED" in +- x86) +- ARCH=i386 +- ;; +- ipaq|sharp) +- ARCH=arm +- ;; +- *) +- ARCH="$CFG_EMBEDDED" +- ;; +- esac +-else +- case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in +- IRIX*:*:*) +- ARCH=`uname -p` +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " SGI ($ARCH)" +- fi +- ;; +- SunOS:5*:sun4*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Sun SPARC (sparc)" +- fi +- ARCH=sparc +- ;; +- Darwin:*:Power?Macintosh) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Apple PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- Darwin:*:x86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Apple Intel (x86)" +- fi +- ARCH=i386 +- ;; +- AIX:*:00????????00) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit IBM PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- HP-UX:*:9000*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " HP PA-RISC (parisc)" +- fi +- ARCH=parisc +- ;; +- *:*:i?86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- *:*:x86_64) +- if [ "$PLATFORM" = "linux-g++-32" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32 bit on 64-bit AMD 80x86 (i386)" +- fi +- ARCH=i386 +- else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- fi +- ;; +- *:*:ppc) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- *:*:*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Trying '$UNAME_MACHINE'..." +- fi +- ARCH="$UNAME_MACHINE" +- ;; +- esac +-fi +- +-if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is supported" +- fi +-else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is unsupported, using 'generic'" +- fi +- ARCH=generic +-fi ++ARCH="$CROSSARCH" + + if [ "$OPT_VERBOSE" = "yes" ]; then + echo "System architecture: '$ARCH'" diff --git a/packages/qt/qt-x11-free-4.1.1/fix-resinit-declaration.patch b/packages/qt/qt-x11-free-4.1.1/fix-resinit-declaration.patch new file mode 100644 index 0000000000..bc30cab216 --- /dev/null +++ b/packages/qt/qt-x11-free-4.1.1/fix-resinit-declaration.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.0.1/src/qt3support/network/q3dns.cpp~fix-resinit-declaration ++++ qt-x11-opensource-src-4.0.1/src/qt3support/network/q3dns.cpp +@@ -30,7 +30,7 @@ + # include + # include + # include +-extern "C" int res_init(); ++extern "C" int res_init() throw (); + #endif + + // POSIX Large File Support redefines open -> open64 diff --git a/packages/qt/qt-x11-free-4.1.1/no-tools.patch b/packages/qt/qt-x11-free-4.1.1/no-tools.patch new file mode 100644 index 0000000000..75a146a838 --- /dev/null +++ b/packages/qt/qt-x11-free-4.1.1/no-tools.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.0.1/src/src.pro~no-tools ++++ qt-x11-opensource-src-4.0.1/src/src.pro +@@ -3,7 +3,7 @@ + + # this order is important + win32:SUBDIRS += winmain +-SUBDIRS += tools/moc tools/rcc tools/uic corelib xml gui sql network ++SUBDIRS += corelib xml gui sql network + !embedded:contains(QT_CONFIG, opengl): SUBDIRS += opengl + contains(QT_CONFIG, qt3support): SUBDIRS += qt3support + !cross_compile { diff --git a/packages/qt/qt-x11-free/gcc4_1-HACK.patch b/packages/qt/qt-x11-free/gcc4_1-HACK.patch new file mode 100644 index 0000000000..818bced4ee --- /dev/null +++ b/packages/qt/qt-x11-free/gcc4_1-HACK.patch @@ -0,0 +1,28 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-free-3.3.6/src/tools/qstring.h~gcc4_1.patch ++++ qt-x11-free-3.3.6/src/tools/qstring.h +@@ -60,7 +60,7 @@ + #endif + #endif + +- ++#define Q_NO_PACKED_REFERENCE + /***************************************************************************** + QString class + *****************************************************************************/ +@@ -194,9 +194,9 @@ + char latin1() const { return ucs > 0xff ? 0 : (char) ucs; } + ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- ushort &unicode() { return *(&ucs); } ++ ushort &unicode() { return *((ushort*)&ucs); } + #else +- ushort &unicode() { return ucs; } ++ ushort &unicode() { return (ushort)ucs; } + #endif + #ifndef QT_NO_CAST_ASCII + // like all ifdef'd code this is undocumented diff --git a/packages/qt/qt-x11-free_3.3.5.bb b/packages/qt/qt-x11-free_3.3.5.bb deleted file mode 100644 index 0f57314971..0000000000 --- a/packages/qt/qt-x11-free_3.3.5.bb +++ /dev/null @@ -1,89 +0,0 @@ -DESCRIPTION = "Qt/X11 Version ${PV}" -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "GPL QPL" -HOMEPAGE = "http://www.trolltech.com" -MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "uicmoc3-native freetype libx11 xft libxext libxrender libxrandr libxcursor mysql" -PROVIDES = "qt3x11" -PR = "r10" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ - file://configure.patch;patch=1 \ - file://no-examples.patch;patch=1" -S = "${WORKDIR}/qt-x11-free-${PV}" - -inherit qmake-base qt3x11 - -export QTDIR = "${S}" -STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3" -ARCH_i686 = "x86" -EXTRA_OEMAKE = "-e" - -QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ - -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose" - -EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ - QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - AR="${TARGET_PREFIX}ar cqs" \ - MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"' - -do_configure() { - echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql - # force regenerate - rm -f src/qtmain.pro - cat Makefile >makefile - find . -name "Makefile"|xargs rm -f - (cd src && qmake -spec ${QMAKESPEC} ) - (cd plugins/src && qmake -spec ${QMAKESPEC} ) - (cd tools && qmake -spec ${QMAKESPEC} ) - (cd tools/qvfb && qmake -spec ${QMAKESPEC} ) -} - -do_compile() { - unset CFLAGS - unset CXXFLAGS - oe_runmake -C src ${EXTRA_ENV} - oe_runmake -C plugins/src ${EXTRA_ENV} - oe_runmake -C tools ${EXTRA_ENV} - oe_runmake -C tools/qvfb ${EXTRA_ENV} -} - -do_stage() { - install -d ${STAGING_QT_DIR}/lib - oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib - install -d ${STAGING_QT_DIR}/include/private - for f in include/*.h - do - install -m 0644 $f ${STAGING_QT_DIR}/include/ - done - for f in include/private/*.h - do - install -m 0644 $f ${STAGING_QT_DIR}/include/private - done - for f in lib/*.prl - do - install -m 0644 $f ${STAGING_QT_DIR}/lib - done -} - -do_install() { - install -d ${D}${libdir}/ - oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ - install -d ${D}${bindir}/ - install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir} - install -d ${D}${prefix}/plugins/ - cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ -} - -PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ - qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" -FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats" -FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers" -FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer" -FILES_qt-x11-designer = "${bindir}/designer" -FILES_qt-x11-assistant = "${bindir}/assistant" -FILES_qt-x11-qvfb = "${bindir}/qvfb" -FILES_qt-x11-qtconfig = "${bindir}/qtconfig" diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb new file mode 100644 index 0000000000..f92414ac73 --- /dev/null +++ b/packages/qt/qt-x11-free_3.3.6.bb @@ -0,0 +1,90 @@ +DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework" +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "GPL QPL" +HOMEPAGE = "http://www.trolltech.com" +MAINTAINER = "Michael 'Mickey' Lauer " +DEPENDS = "uicmoc3-native freetype libx11 xft libxext libxrender libxrandr libxcursor mysql" +PROVIDES = "qt3x11" +PR = "r0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ + file://configure.patch;patch=1 \ + file://no-examples.patch;patch=1 \ + file://gcc4_1-HACK.patch;patch=1" +S = "${WORKDIR}/qt-x11-free-${PV}" + +inherit qmake-base qt3x11 + +export QTDIR = "${S}" +STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3" +ARCH_i686 = "x86" +EXTRA_OEMAKE = "-e" + +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ + -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose" + +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"' + +do_configure() { + echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql + # force regenerate + rm -f src/qtmain.pro + cat Makefile >makefile + find . -name "Makefile"|xargs rm -f + (cd src && qmake -spec ${QMAKESPEC} ) + (cd plugins/src && qmake -spec ${QMAKESPEC} ) + (cd tools && qmake -spec ${QMAKESPEC} ) + (cd tools/qvfb && qmake -spec ${QMAKESPEC} ) +} + +do_compile() { + unset CFLAGS + unset CXXFLAGS + oe_runmake -C src ${EXTRA_ENV} + oe_runmake -C plugins/src ${EXTRA_ENV} + oe_runmake -C tools ${EXTRA_ENV} + oe_runmake -C tools/qvfb ${EXTRA_ENV} +} + +do_stage() { + install -d ${STAGING_QT_DIR}/lib + oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib + install -d ${STAGING_QT_DIR}/include/private + for f in include/*.h + do + install -m 0644 $f ${STAGING_QT_DIR}/include/ + done + for f in include/private/*.h + do + install -m 0644 $f ${STAGING_QT_DIR}/include/private + done + for f in lib/*.prl + do + install -m 0644 $f ${STAGING_QT_DIR}/lib + done +} + +do_install() { + install -d ${D}${libdir}/ + oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ + install -d ${D}${bindir}/ + install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir} + install -d ${D}${prefix}/plugins/ + cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ +} + +PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ + qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" +FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats" +FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers" +FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer" +FILES_qt-x11-designer = "${bindir}/designer" +FILES_qt-x11-assistant = "${bindir}/assistant" +FILES_qt-x11-qvfb = "${bindir}/qvfb" +FILES_qt-x11-qtconfig = "${bindir}/qtconfig" diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.0.1.bb deleted file mode 100644 index 32ddca6158..0000000000 --- a/packages/qt/qt-x11-free_4.0.1.bb +++ /dev/null @@ -1,117 +0,0 @@ -DESCRIPTION = "Qt/X11 Version ${PV}" -SECTION = "x11/libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -LICENSE = "GPL QPL" -MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "uicmoc4-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor mysql" -PROVIDES = "qt4x11" -# FIXME: Make it use 'our' qmake -# DEPENDS += "qmake-native-2.00a" -PR = "r1" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ - file://cross-compile.patch;patch=1 \ - file://fix-resinit-declaration.patch;patch=1 \ - file://no-tools.patch;patch=1" -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - -# Not the prime time of Qt4 yet ... -# TODO: make it not look in /usr and /usr/include for its tests! -DEFAULT_PREFERENCE = "-1" -BROKEN = "1" - -PARALLEL_MAKE = "" - -inherit qmake-base qt4x11 pkgconfig - -export QTDIR = "${S}" -STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" -export ARCH = "${TARGET_ARCH}" -export ARCH_i686 = "x86" -EXTRA_OEMAKE = "-e" - -QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ - -no-tablet -no-xkb -no-nis -no-cups -no-opengl -plugin-sql-mysql -verbose -stl" - -# EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ - -EXTRA_ENV = 'QMAKE="${S}/bin/qmake -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ - QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - AR="${TARGET_PREFIX}ar cqs" \ - MOC="${STAGING_BINDIR}/moc4" UIC="${STAGING_BINDIR}/uic4" MAKE="make -e"' - -do_configure() { - echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri - echo "DEFINES += QT_NO_XIM" >>src/qbase.pri - unset QMAKESPEC - echo yes | ./configure -prefix ${prefix} -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql -} - -# FIXME: Might want to compile the cross tools for the -dev packages as well... - -do_compile() { - unset CFLAGS CXXFLAGS - install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc - install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc - install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic - - oe_runmake ${EXTRA_ENV} -} - -PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Xml" - -do_stage() { - install -d ${STAGING_QT_DIR} - for part in ${PARTS} - do - oe_libinstall -so -C lib libQt$part ${STAGING_QT_DIR} - done - oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} - cp -pPR include/* ${STAGING_INCDIR}/ -} - -do_install() { - install -d ${D}${libdir} - install -d ${D}${bindir} - for part in ${PARTS} - do - oe_libinstall -so -C lib libQt$part ${D}${libdir} - done - oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} - cp -pPR include/* ${D}${incdir} - cp -pPR plugins ${D}${libdir} - cp -pPR bin/* ${D}${bindir} - - install -d ${D}${bindir}/qt4-examples - for binary in `find examples -perm 0755 -type f` - do - install -m 0755 $binary ${D}${bindir}/qt4-examples/ - done -} - -PACKAGES =+ "libqtcore4 libqtxml4 libqtgui4 libqtnetwork4 libqtsql4 libqtdesigner4 libqtdesignercomponents4 \ - qt4-assistant qt4-designer qt4-examples qt4-linguist \ - qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers" - -FILES_libqtcore4 = "${libdir}/libQtCore.so*" -FILES_libqtgui4 = "${libdir}/libQtGui.so*" -FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so*" -FILES_libqtxml4 = "${libdir}/libQtXml.so*" -FILES_libqtsql4 = "${libdir}/libQtSql.so*" -FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so*" -FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so*" - -FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" -FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" -FILES_qt4-plugins-designer = "${libdir}/plugins/designer/*.so" -FILES_qt4-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" -FILES_qt4-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" - -FILES_qt4-assistant = "${bindir}/*assistant*" -FILES_qt4-designer = "${bindir}/*designer*" -FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" - -FILES_qt4-examples = "${bindir}/qt4-examples/*" diff --git a/packages/qt/qt-x11-free_4.1.1.bb b/packages/qt/qt-x11-free_4.1.1.bb new file mode 100644 index 0000000000..32ddca6158 --- /dev/null +++ b/packages/qt/qt-x11-free_4.1.1.bb @@ -0,0 +1,117 @@ +DESCRIPTION = "Qt/X11 Version ${PV}" +SECTION = "x11/libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL QPL" +MAINTAINER = "Michael 'Mickey' Lauer " +DEPENDS = "uicmoc4-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor mysql" +PROVIDES = "qt4x11" +# FIXME: Make it use 'our' qmake +# DEPENDS += "qmake-native-2.00a" +PR = "r1" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ + file://cross-compile.patch;patch=1 \ + file://fix-resinit-declaration.patch;patch=1 \ + file://no-tools.patch;patch=1" +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + +# Not the prime time of Qt4 yet ... +# TODO: make it not look in /usr and /usr/include for its tests! +DEFAULT_PREFERENCE = "-1" +BROKEN = "1" + +PARALLEL_MAKE = "" + +inherit qmake-base qt4x11 pkgconfig + +export QTDIR = "${S}" +STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" +export ARCH = "${TARGET_ARCH}" +export ARCH_i686 = "x86" +EXTRA_OEMAKE = "-e" + +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ + -no-tablet -no-xkb -no-nis -no-cups -no-opengl -plugin-sql-mysql -verbose -stl" + +# EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ + +EXTRA_ENV = 'QMAKE="${S}/bin/qmake -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR}/moc4" UIC="${STAGING_BINDIR}/uic4" MAKE="make -e"' + +do_configure() { + echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri + echo "DEFINES += QT_NO_XIM" >>src/qbase.pri + unset QMAKESPEC + echo yes | ./configure -prefix ${prefix} -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql +} + +# FIXME: Might want to compile the cross tools for the -dev packages as well... + +do_compile() { + unset CFLAGS CXXFLAGS + install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc + install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc + install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic + + oe_runmake ${EXTRA_ENV} +} + +PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Xml" + +do_stage() { + install -d ${STAGING_QT_DIR} + for part in ${PARTS} + do + oe_libinstall -so -C lib libQt$part ${STAGING_QT_DIR} + done + oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} + cp -pPR include/* ${STAGING_INCDIR}/ +} + +do_install() { + install -d ${D}${libdir} + install -d ${D}${bindir} + for part in ${PARTS} + do + oe_libinstall -so -C lib libQt$part ${D}${libdir} + done + oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} + cp -pPR include/* ${D}${incdir} + cp -pPR plugins ${D}${libdir} + cp -pPR bin/* ${D}${bindir} + + install -d ${D}${bindir}/qt4-examples + for binary in `find examples -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir}/qt4-examples/ + done +} + +PACKAGES =+ "libqtcore4 libqtxml4 libqtgui4 libqtnetwork4 libqtsql4 libqtdesigner4 libqtdesignercomponents4 \ + qt4-assistant qt4-designer qt4-examples qt4-linguist \ + qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers" + +FILES_libqtcore4 = "${libdir}/libQtCore.so*" +FILES_libqtgui4 = "${libdir}/libQtGui.so*" +FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so*" +FILES_libqtxml4 = "${libdir}/libQtXml.so*" +FILES_libqtsql4 = "${libdir}/libQtSql.so*" +FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so*" +FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so*" + +FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" +FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" +FILES_qt4-plugins-designer = "${libdir}/plugins/designer/*.so" +FILES_qt4-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" +FILES_qt4-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" + +FILES_qt4-assistant = "${bindir}/*assistant*" +FILES_qt4-designer = "${bindir}/*designer*" +FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" + +FILES_qt4-examples = "${bindir}/qt4-examples/*" -- cgit v1.2.3 From fffa20c09a48995b3bc0495e80b12ce7716c6c27 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 30 Mar 2006 15:47:43 +0000 Subject: python: upgrade to the latest and greatest version: 2.4.3 --- packages/python/python-2.4.2-manifest.inc | 259 ----- packages/python/python-2.4.2/.mtn2git_empty | 0 packages/python/python-2.4.2/autohell.patch | 1209 -------------------- packages/python/python-2.4.2/bindir-libdir.patch | 18 - packages/python/python-2.4.2/crosscompile.patch | 108 -- .../python-2.4.2/fix-tkinter-detection.patch | 39 - packages/python/python-2.4.3-manifest.inc | 259 +++++ packages/python/python-2.4.3/.mtn2git_empty | 0 packages/python/python-2.4.3/autohell.patch | 1209 ++++++++++++++++++++ packages/python/python-2.4.3/bindir-libdir.patch | 18 + packages/python/python-2.4.3/crosscompile.patch | 108 ++ .../python-2.4.3/fix-tkinter-detection.patch | 39 + packages/python/python_2.4.2.bb | 67 -- packages/python/python_2.4.3.bb | 67 ++ 14 files changed, 1700 insertions(+), 1700 deletions(-) delete mode 100644 packages/python/python-2.4.2-manifest.inc delete mode 100644 packages/python/python-2.4.2/.mtn2git_empty delete mode 100644 packages/python/python-2.4.2/autohell.patch delete mode 100644 packages/python/python-2.4.2/bindir-libdir.patch delete mode 100644 packages/python/python-2.4.2/crosscompile.patch delete mode 100644 packages/python/python-2.4.2/fix-tkinter-detection.patch create mode 100644 packages/python/python-2.4.3-manifest.inc create mode 100644 packages/python/python-2.4.3/.mtn2git_empty create mode 100644 packages/python/python-2.4.3/autohell.patch create mode 100644 packages/python/python-2.4.3/bindir-libdir.patch create mode 100644 packages/python/python-2.4.3/crosscompile.patch create mode 100644 packages/python/python-2.4.3/fix-tkinter-detection.patch delete mode 100644 packages/python/python_2.4.2.bb create mode 100644 packages/python/python_2.4.3.bb (limited to 'packages') diff --git a/packages/python/python-2.4.2-manifest.inc b/packages/python/python-2.4.2-manifest.inc deleted file mode 100644 index da7fc6d28b..0000000000 --- a/packages/python/python-2.4.2-manifest.inc +++ /dev/null @@ -1,259 +0,0 @@ -######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer ] on Sun Mar 12 18:58:32 2006 -### -### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy -### -### Warning: Manual edits will be lost! -### -######################################################################################################################## - - -PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " - -DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml2" -RDEPENDS_python-threading="python-core python-lang" -FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* " - -DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml2" -RDEPENDS_python-distutils="python-core" -FILES_python-distutils="${libdir}/python2.4/config ${libdir}/python2.4/distutils " - -DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml1" -RDEPENDS_python-textutils="python-core python-io python-re python-stringold" -FILES_python-textutils="${libdir}/python2.4/lib-dynload/_csv.so ${libdir}/python2.4/csv.* ${libdir}/python2.4/optparse.* ${libdir}/python2.4/textwrap.* " - -DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml2" -RDEPENDS_python-codecs="python-core" -FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/gettext.* ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/stringprep.* ${libdir}/python2.4/xdrlib.* " - -DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml1" -RDEPENDS_python-pickle="python-core python-codecs python-re" -FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so " - -DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml1" -RDEPENDS_python-datetime="python-core python-codecs" -FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so " - -DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml2" -RDEPENDS_python-core="" -FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python " - -DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml2" -RDEPENDS_python-io="python-core python-math" -FILES_python-io="${libdir}/python2.4/lib-dynload/_socket.so ${libdir}/python2.4/lib-dynload/_ssl.so ${libdir}/python2.4/lib-dynload/select.so ${libdir}/python2.4/lib-dynload/termios.so ${libdir}/python2.4/lib-dynload/cStringIO.so ${libdir}/python2.4/pipes.* ${libdir}/python2.4/socket.* ${libdir}/python2.4/tempfile.* ${libdir}/python2.4/StringIO.* " - -DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml1" -RDEPENDS_python-compiler="python-core" -FILES_python-compiler="${libdir}/python2.4/compiler " - -DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml1" -RDEPENDS_python-compression="python-core python-zlib" -FILES_python-compression="${libdir}/python2.4/gzip.* ${libdir}/python2.4/zipfile.* " - -DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml2" -RDEPENDS_python-re="python-core" -FILES_python-re="${libdir}/python2.4/re.* ${libdir}/python2.4/sre.* ${libdir}/python2.4/sre_compile.* ${libdir}/python2.4/sre_constants* ${libdir}/python2.4/sre_parse.* " - -DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml1" -RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" -FILES_python-xmlrpc="${libdir}/python2.4/xmlrpclib.* ${libdir}/python2.4/SimpleXMLRPCServer.* " - -DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml1" -RDEPENDS_python-terminal="python-core python-io" -FILES_python-terminal="${libdir}/python2.4/pty.* ${libdir}/python2.4/tty.* " - -DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml1" -RDEPENDS_python-email="python-core python-io python-re" -FILES_python-email="${libdir}/python2.4/email " - -DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml1" -RDEPENDS_python-image="python-core" -FILES_python-image="${libdir}/python2.4/colorsys.* ${libdir}/python2.4/imghdr.* ${libdir}/python2.4/lib-dynload/imageop.so ${libdir}/python2.4/lib-dynload/rgbimg.so " - -DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml1" -RDEPENDS_python-resource="python-core" -FILES_python-resource="${libdir}/python2.4/lib-dynload/resource.so " - -DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml1" -RDEPENDS_python-devel="python-core" -FILES_python-devel="/usr/include /usr/lib/python2.4/config " - -DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml1" -RDEPENDS_python-math="python-core" -FILES_python-math="${libdir}/python2.4/lib-dynload/cmath.so ${libdir}/python2.4/lib-dynload/math.so ${libdir}/python2.4/lib-dynload/_random.so ${libdir}/python2.4/random.* ${libdir}/python2.4/sets.* " - -DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml1" -RDEPENDS_python-hotshot="python-core" -FILES_python-hotshot="${libdir}/python2.4/hotshot ${libdir}/python2.4/lib-dynload/_hotshot.so " - -DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml1" -RDEPENDS_python-unixadmin="python-core" -FILES_python-unixadmin="${libdir}/python2.4/lib-dynload/nis.so ${libdir}/python2.4/lib-dynload/grp.so ${libdir}/python2.4/lib-dynload/pwd.so ${libdir}/python2.4/getpass.* " - -DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml1" -RDEPENDS_python-tkinter="python-core" -FILES_python-tkinter="${libdir}/python2.4/lib-dynload/_tkinter.so ${libdir}/python2.4/lib-tk " - -DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml1" -RDEPENDS_python-gdbm="python-core libgdbm3" -FILES_python-gdbm="${libdir}/python2.4/lib-dynload/gdbm.so " - -DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml1" -RDEPENDS_python-fcntl="python-core" -FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so " - -DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml2" -RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime" -FILES_python-netclient="${libdir}/python2.4/_LWPCookieJar.* ${libdir}/python2.4/_MozillaCookieJar.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* " - -DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml1" -RDEPENDS_python-pprint="python-core" -FILES_python-pprint="${libdir}/python2.4/pprint.* " - -DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml1" -RDEPENDS_python-netserver="python-core python-netclient" -FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* " - -DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml1" -RDEPENDS_python-curses="python-core libncurses5" -FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so " - -DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml1" -RDEPENDS_python-syslog="python-core" -FILES_python-syslog="${libdir}/python2.4/lib-dynload/syslog.so " - -DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml1" -RDEPENDS_python-html="python-core" -FILES_python-html="${libdir}/python2.4/formatter.* ${libdir}/python2.4/htmlentitydefs.* ${libdir}/python2.4/htmllib.* ${libdir}/python2.4/markupbase.* ${libdir}/python2.4/sgmllib.* " - -DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml1" -RDEPENDS_python-readline="python-core libreadline4" -FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* " - -DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml1" -RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" -FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.4/pydoc.* " - -DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml1" -RDEPENDS_python-logging="python-core" -FILES_python-logging="${libdir}/python2.4/logging " - -DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml1" -RDEPENDS_python-mailbox="python-core python-mime" -FILES_python-mailbox="${libdir}/python2.4/mailbox.* " - -DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml1" -RDEPENDS_python-xml="python-core python-re" -FILES_python-xml="${libdir}/python2.4/lib-dynload/pyexpat.so ${libdir}/python2.4/xml ${libdir}/python2.4/xmllib.* " - -DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml2" -RDEPENDS_python-mime="python-core python-io" -FILES_python-mime="${libdir}/python2.4/mimetools.* ${libdir}/python2.4/quopri.* ${libdir}/python2.4/rfc822.* " - -DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml1" -RDEPENDS_python-tests="python-core" -FILES_python-tests="${libdir}/python2.4/test " - -DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml1" -RDEPENDS_python-unittest="python-core python-stringold python-lang" -FILES_python-unittest="${libdir}/python2.4/unittest.* " - -DESCRIPTION_python-stringold="Python Deprecated String APIs" -PR_python-stringold="ml2" -RDEPENDS_python-stringold="python-core python-re" -FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* " - -DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml1" -RDEPENDS_python-lib-old-and-deprecated="python-core" -FILES_python-lib-old-and-deprecated="${libdir}/python2.4/lib-old " - -DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml1" -RDEPENDS_python-compile="python-core" -FILES_python-compile="${libdir}/python2.4/py_compile.* ${libdir}/python2.4/compileall.* " - -DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml1" -RDEPENDS_python-shell="python-core python-re" -FILES_python-shell="${libdir}/python2.4/commands.* ${libdir}/python2.4/dircache.* ${libdir}/python2.4/fnmatch.* ${libdir}/python2.4/glob.* ${libdir}/python2.4/popen2.* ${libdir}/python2.4/shutil.* " - -DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml1" -RDEPENDS_python-bsddb="python-core" -FILES_python-bsddb="${libdir}/python2.4/bsddb " - -DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml1" -RDEPENDS_python-mmap="python-core python-io" -FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so " - -DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml1" -RDEPENDS_python-zlib="python-core libz1" -FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so " - -DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml1" -RDEPENDS_python-db="python-core" -FILES_python-db="${libdir}/python2.4/anydbm.* ${libdir}/python2.4/dumbdbm.* ${libdir}/python2.4/whichdb.* " - -DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml1" -RDEPENDS_python-crypt="python-core" -FILES_python-crypt="${libdir}/python2.4/lib-dynload/crypt.so ${libdir}/python2.4/lib-dynload/md5.so ${libdir}/python2.4/lib-dynload/rotor.so ${libdir}/python2.4/lib-dynload/sha.so " - -DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml1" -RDEPENDS_python-idle="python-core python-tkinter" -FILES_python-idle="/usr/bin/idle /usr/lib/python2.4/idlelib " - -DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml1" -RDEPENDS_python-lang="python-core" -FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* " - -DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml1" -RDEPENDS_python-audio="python-core" -FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so " - - - diff --git a/packages/python/python-2.4.2/.mtn2git_empty b/packages/python/python-2.4.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/python/python-2.4.2/autohell.patch b/packages/python/python-2.4.2/autohell.patch deleted file mode 100644 index b0eebb9ce8..0000000000 --- a/packages/python/python-2.4.2/autohell.patch +++ /dev/null @@ -1,1209 +0,0 @@ ---- Python-2.3.3/acinclude.m4 1969-12-31 19:00:00.000000000 -0500 -+++ Python-2.3.3/acinclude.m4 2004-02-17 12:22:29.000000000 -0500 -@@ -0,0 +1,10 @@ -+dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore -+dnl If this macro is not defined by Autoconf, define it here. -+ -+m4_ifdef([AC_PROG_CXX_WORKS], -+ [], -+ [m4_define([AC_PROG_CXX_WORKS], -+ [AC_LANG_PUSH(C++)dnl -+ _AC_COMPILER_EXEEXT -+ AC_LANG_POP()] -+ )]) ---- Python-2.3.3/configure.in 2003-11-18 14:59:39.000000000 -0500 -+++ Python-2.3.3/configure.in 2004-02-17 12:22:27.000000000 -0500 -@@ -4,8 +4,8 @@ - m4_define(PYTHON_VERSION, 2.3) - - AC_REVISION($Revision: 1.427.4.10 $) --AC_PREREQ(2.53) --AC_INIT(python, PYTHON_VERSION) -+AC_PREREQ(2.59) -+AC_INIT([python],[PYTHON_VERSION]) - AC_CONFIG_SRCDIR([Include/object.h]) - AC_CONFIG_HEADER(pyconfig.h) - -@@ -58,7 +58,7 @@ - - dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output - AC_ARG_ENABLE(framework, -- AC_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@, Build (MacOSX|Darwin) framework), -+ AS_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@,Build (MacOSX|Darwin) framework), - [ - case $enableval in - yes) -@@ -92,8 +92,7 @@ - AC_SUBST(PYTHONFRAMEWORKINSTALLDIR) - - ##AC_ARG_WITH(dyld, --## AC_HELP_STRING(--with-dyld, --## Use (OpenStep|Rhapsody) dynamic linker)) -+## AS_HELP_STRING(--with-dyld,## Use (OpenStep|Rhapsody) dynamic linker)) - ## - # Set name for machine-dependent library files - AC_SUBST(MACHDEP) -@@ -227,7 +226,7 @@ - # on that fiddles with OPT and BASECFLAGS? - AC_MSG_CHECKING(for --without-gcc) - AC_ARG_WITH(gcc, -- AC_HELP_STRING(--without-gcc,never use gcc), -+ AS_HELP_STRING(--without-gcc,never use gcc), - [ - case $withval in - no) CC=cc -@@ -273,7 +272,7 @@ - MAINOBJ=python.o - AC_MSG_CHECKING(for --with-cxx=) - AC_ARG_WITH(cxx, -- AC_HELP_STRING(--with-cxx=, enable C++ support), -+ AS_HELP_STRING(--with-cxx=,enable C++ support), - [ - check_cxx=no - case $withval in -@@ -298,15 +297,6 @@ - dnl --without-cxx was given. - dnl Finally, it does not test whether CXX is g++. - --dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore --ifdef([AC_PROG_CXX_WORKS],[], -- [AC_DEFUN([AC_PROG_CXX_WORKS], -- [AC_LANG_PUSH(C++)dnl -- _AC_COMPILER_EXEEXT -- AC_LANG_POP() -- ] --)]) -- - if test "$check_cxx" = "yes" - then - AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, notfound) -@@ -348,7 +338,7 @@ - AC_EXEEXT - AC_MSG_CHECKING(for --with-suffix) - AC_ARG_WITH(suffix, -- AC_HELP_STRING(--with-suffix=.exe, set executable suffix), -+ AS_HELP_STRING(--with-suffix=.exe,set executable suffix), - [ - case $withval in - no) EXEEXT=;; -@@ -474,7 +464,7 @@ - - AC_MSG_CHECKING(for --enable-shared) - AC_ARG_ENABLE(shared, -- AC_HELP_STRING(--enable-shared, disable/enable building shared python library)) -+ AS_HELP_STRING(--enable-shared,disable/enable building shared python library)) - - if test -z "$enable_shared" - then -@@ -583,7 +573,7 @@ - # Check for --with-pydebug - AC_MSG_CHECKING(for --with-pydebug) - AC_ARG_WITH(pydebug, -- AC_HELP_STRING(--with-pydebug, build with Py_DEBUG defined), -+ AS_HELP_STRING(--with-pydebug,build with Py_DEBUG defined), - [ - if test "$withval" != no - then -@@ -660,10 +650,7 @@ - AC_MSG_CHECKING(whether $CC accepts -fno-strict-aliasing) - ac_save_cc="$CC" - CC="$CC -fno-strict-aliasing" -- AC_TRY_RUN([int main() { return 0; }], -- ac_cv_no_strict_aliasing_ok=yes, -- ac_cv_no_strict_aliasing_ok=no, -- ac_cv_no_strict_aliasing_ok=no) -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_no_strict_aliasing_ok=yes],[ac_cv_no_strict_aliasing_ok=no],[ac_cv_no_strict_aliasing_ok=no]) - CC="$ac_save_cc" - AC_MSG_RESULT($ac_cv_no_strict_aliasing_ok) - if test $ac_cv_no_strict_aliasing_ok = yes -@@ -711,10 +698,7 @@ - AC_CACHE_VAL(ac_cv_opt_olimit_ok, - [ac_save_cc="$CC" - CC="$CC -OPT:Olimit=0" --AC_TRY_RUN([int main() { return 0; }], -- ac_cv_opt_olimit_ok=yes, -- ac_cv_opt_olimit_ok=no, -- ac_cv_opt_olimit_ok=no) -+AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_opt_olimit_ok=yes],[ac_cv_opt_olimit_ok=no],[ac_cv_opt_olimit_ok=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_opt_olimit_ok) - if test $ac_cv_opt_olimit_ok = yes; then -@@ -733,10 +717,7 @@ - AC_CACHE_VAL(ac_cv_olimit_ok, - [ac_save_cc="$CC" - CC="$CC -Olimit 1500" -- AC_TRY_RUN([int main() { return 0; }], -- ac_cv_olimit_ok=yes, -- ac_cv_olimit_ok=no, -- ac_cv_olimit_ok=no) -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_olimit_ok=yes],[ac_cv_olimit_ok=no],[ac_cv_olimit_ok=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_olimit_ok) - if test $ac_cv_olimit_ok = yes; then -@@ -751,7 +732,7 @@ - # options before we can check whether -Kpthread improves anything. - AC_MSG_CHECKING(whether pthreads are available without options) - AC_CACHE_VAL(ac_cv_pthread_is_default, --[AC_TRY_RUN([ -+[AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - - void* routine(void* p){return NULL;} -@@ -763,14 +744,11 @@ - (void)pthread_detach(p); - return 0; - } --], --[ -+]])],[ - ac_cv_pthread_is_default=yes - ac_cv_kthread=no - ac_cv_pthread=no --], -- ac_cv_pthread_is_default=no, -- ac_cv_pthread_is_default=no) -+],[ac_cv_pthread_is_default=no],[ac_cv_pthread_is_default=no]) - ]) - AC_MSG_RESULT($ac_cv_pthread_is_default) - -@@ -788,7 +766,7 @@ - AC_CACHE_VAL(ac_cv_kpthread, - [ac_save_cc="$CC" - CC="$CC -Kpthread" --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - - void* routine(void* p){return NULL;} -@@ -800,10 +778,7 @@ - (void)pthread_detach(p); - return 0; - } --], -- ac_cv_kpthread=yes, -- ac_cv_kpthread=no, -- ac_cv_kpthread=no) -+]])],[ac_cv_kpthread=yes],[ac_cv_kpthread=no],[ac_cv_kpthread=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_kpthread) - fi -@@ -819,7 +794,7 @@ - AC_CACHE_VAL(ac_cv_kthread, - [ac_save_cc="$CC" - CC="$CC -Kthread" --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - - void* routine(void* p){return NULL;} -@@ -831,10 +806,7 @@ - (void)pthread_detach(p); - return 0; - } --], -- ac_cv_kthread=yes, -- ac_cv_kthread=no, -- ac_cv_kthread=no) -+]])],[ac_cv_kthread=yes],[ac_cv_kthread=no],[ac_cv_kthread=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_kthread) - fi -@@ -850,7 +822,7 @@ - AC_CACHE_VAL(ac_cv_thread, - [ac_save_cc="$CC" - CC="$CC -pthread" --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - - void* routine(void* p){return NULL;} -@@ -862,10 +834,7 @@ - (void)pthread_detach(p); - return 0; - } --], -- ac_cv_pthread=yes, -- ac_cv_pthread=no, -- ac_cv_pthread=no) -+]])],[ac_cv_pthread=yes],[ac_cv_pthread=no],[ac_cv_pthread=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_pthread) - fi -@@ -911,11 +880,11 @@ - - dnl # check for ANSI or K&R ("traditional") preprocessor - dnl AC_MSG_CHECKING(for C preprocessor type) --dnl AC_TRY_COMPILE([ -+dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - dnl #define spam(name, doc) {#name, &name, #name "() -- " doc} - dnl int foo; - dnl struct {char *name; int *addr; char *doc;} desc = spam(foo, "something"); --dnl ], [;], cpp_type=ansi, AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional) -+dnl ]], [[;]])],[cpp_type=ansi],[AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional]) - dnl AC_MSG_RESULT($cpp_type) - - # checks for header files -@@ -941,19 +910,13 @@ - - # Check whether using makedev requires defining _OSF_SOURCE - AC_MSG_CHECKING(for makedev) --AC_TRY_LINK([#include ], -- [ makedev(0, 0) ], -- ac_cv_has_makedev=yes, -- ac_cv_has_makedev=no) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no]) - if test "$ac_cv_has_makedev" = "no"; then - # we didn't link, try if _OSF_SOURCE will allow us to link -- AC_TRY_LINK([ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #define _OSF_SOURCE 1 - #include -- ], -- [ makedev(0, 0) ], -- ac_cv_has_makedev=yes, -- ac_cv_has_makedev=no) -+ ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no]) - if test "$ac_cv_has_makedev" = "yes"; then - AC_DEFINE(_OSF_SOURCE, 1, [Define _OSF_SOURCE to get the makedev macro.]) - fi -@@ -972,11 +935,11 @@ - - use_lfs=yes - AC_MSG_CHECKING(Solaris LFS bug) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #define _LARGEFILE_SOURCE 1 - #define _FILE_OFFSET_BITS 64 - #include --],struct rlimit foo;,sol_lfs_bug=no,sol_lfs_bug=yes) -+]], [[struct rlimit foo;]])],[sol_lfs_bug=no],[sol_lfs_bug=yes]) - AC_MSG_RESULT($sol_lfs_bug) - if test "$sol_lfs_bug" = "yes"; then - use_lfs=no -@@ -1018,10 +981,10 @@ - - AC_MSG_CHECKING(for long long support) - have_long_long=no --AC_TRY_COMPILE([], [long long x; x = (long long)0;], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long x; x = (long long)0;]])],[ - AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.]) - have_long_long=yes --]) -+],[]) - AC_MSG_RESULT($have_long_long) - if test "$have_long_long" = yes ; then - AC_CHECK_SIZEOF(long long, 8) -@@ -1029,10 +992,10 @@ - - AC_MSG_CHECKING(for uintptr_t support) - have_uintptr_t=no --AC_TRY_COMPILE([], [uintptr_t x; x = (uintptr_t)0;], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[uintptr_t x; x = (uintptr_t)0;]])],[ - AC_DEFINE(HAVE_UINTPTR_T, 1, [Define this if you have the type uintptr_t.]) - have_uintptr_t=yes --]) -+],[]) - AC_MSG_RESULT($have_uintptr_t) - if test "$have_uintptr_t" = yes ; then - AC_CHECK_SIZEOF(uintptr_t, 4) -@@ -1041,7 +1004,7 @@ - # Hmph. AC_CHECK_SIZEOF() doesn't include . - AC_MSG_CHECKING(size of off_t) - AC_CACHE_VAL(ac_cv_sizeof_off_t, --[AC_TRY_RUN([#include -+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include - #include - main() - { -@@ -1049,10 +1012,7 @@ - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(off_t)); - exit(0); --}], --ac_cv_sizeof_off_t=`cat conftestval`, --ac_cv_sizeof_off_t=0, --ac_cv_sizeof_off_t=4) -+}]])],[ac_cv_sizeof_off_t=`cat conftestval`],[ac_cv_sizeof_off_t=0],[ac_cv_sizeof_off_t=4]) - ]) - AC_MSG_RESULT($ac_cv_sizeof_off_t) - AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t, -@@ -1075,7 +1035,7 @@ - # AC_CHECK_SIZEOF() doesn't include . - AC_MSG_CHECKING(size of time_t) - AC_CACHE_VAL(ac_cv_sizeof_time_t, --[AC_TRY_RUN([#include -+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include - #include - main() - { -@@ -1083,10 +1043,7 @@ - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(time_t)); - exit(0); --}], --ac_cv_sizeof_time_t=`cat conftestval`, --ac_cv_sizeof_time_t=0, --ac_cv_sizeof_time_t=4) -+}]])],[ac_cv_sizeof_time_t=`cat conftestval`],[ac_cv_sizeof_time_t=0],[ac_cv_sizeof_time_t=4]) - ]) - AC_MSG_RESULT($ac_cv_sizeof_time_t) - AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t, -@@ -1104,13 +1061,13 @@ - fi - AC_MSG_CHECKING(for pthread_t) - have_pthread_t=no --AC_TRY_COMPILE([#include ], [pthread_t x; x = *(pthread_t*)0;], have_pthread_t=yes) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[pthread_t x; x = *(pthread_t*)0;]])],[have_pthread_t=yes],[]) - AC_MSG_RESULT($have_pthread_t) - if test "$have_pthread_t" = yes ; then - # AC_CHECK_SIZEOF() doesn't include . - AC_MSG_CHECKING(size of pthread_t) - AC_CACHE_VAL(ac_cv_sizeof_pthread_t, -- [AC_TRY_RUN([#include -+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include - #include - main() - { -@@ -1118,10 +1075,7 @@ - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(pthread_t)); - exit(0); -- }], -- ac_cv_sizeof_pthread_t=`cat conftestval`, -- ac_cv_sizeof_pthread_t=0, -- ac_cv_sizeof_pthread_t=4) -+ }]])],[ac_cv_sizeof_pthread_t=`cat conftestval`],[ac_cv_sizeof_pthread_t=0],[ac_cv_sizeof_pthread_t=4]) - ]) - AC_MSG_RESULT($ac_cv_sizeof_pthread_t) - AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t, -@@ -1131,7 +1085,7 @@ - - AC_MSG_CHECKING(for --enable-toolbox-glue) - AC_ARG_ENABLE(toolbox-glue, -- AC_HELP_STRING(--enable-toolbox-glue, disable/enable MacOSX glue code for extensions)) -+ AS_HELP_STRING(--enable-toolbox-glue,disable/enable MacOSX glue code for extensions)) - - if test -z "$enable_toolbox_glue" - then -@@ -1436,13 +1390,10 @@ - # checks for system dependent C++ extensions support - case "$ac_sys_system" in - AIX*) AC_MSG_CHECKING(for genuine AIX C++ extensions support) -- AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"], -- [loadAndInit("", 0, "")], -- [AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1, -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "/usr/lpp/xlC/include/load.h"]], [[loadAndInit("", 0, "")]])],[AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1, - [Define for AIX if your compiler is a genuine IBM xlC/xlC_r - and you want support for AIX C++ shared extension modules.]) -- AC_MSG_RESULT(yes)], -- [AC_MSG_RESULT(no)]);; -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]);; - *) ;; - esac - -@@ -1464,7 +1415,7 @@ - - AC_MSG_CHECKING(for --with-libs) - AC_ARG_WITH(libs, -- AC_HELP_STRING(--with-libs='lib1 ...', link against additional libs), -+ AS_HELP_STRING(--with-libs='lib1 ...',link against additional libs), - [ - AC_MSG_RESULT($withval) - LIBS="$withval $LIBS" -@@ -1476,7 +1427,7 @@ - AC_SUBST(SIGNAL_OBJS) - AC_MSG_CHECKING(for --with-signal-module) - AC_ARG_WITH(signal-module, -- AC_HELP_STRING(--with-signal-module, disable/enable signal module)) -+ AS_HELP_STRING(--with-signal-module,disable/enable signal module)) - - if test -z "$with_signal_module" - then with_signal_module="yes" -@@ -1498,7 +1449,7 @@ - AC_MSG_CHECKING(for --with-dec-threads) - AC_SUBST(LDLAST) - AC_ARG_WITH(dec-threads, -- AC_HELP_STRING(--with-dec-threads, use DEC Alpha/OSF1 thread-safe libraries), -+ AS_HELP_STRING(--with-dec-threads,use DEC Alpha/OSF1 thread-safe libraries), - [ - AC_MSG_RESULT($withval) - LDLAST=-threads -@@ -1518,12 +1469,12 @@ - AC_MSG_CHECKING(for --with-threads) - dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output - AC_ARG_WITH(threads, -- AC_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@, disable/enable thread support)) -+ AS_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@,disable/enable thread support)) - - # --with-thread is deprecated, but check for it anyway - dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output - AC_ARG_WITH(thread, -- AC_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@, deprecated; use --with(out)-threads), -+ AS_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@,deprecated; use --with(out)-threads), - [with_threads=$with_thread]) - - if test -z "$with_threads" -@@ -1603,7 +1554,7 @@ - THREADOBJ="Python/thread.o"],[ - AC_MSG_CHECKING(for --with-pth) - AC_ARG_WITH([pth], -- AC_HELP_STRING(--with-pth, use GNU pth threading libraries), -+ AS_HELP_STRING(--with-pth,use GNU pth threading libraries), - [AC_MSG_RESULT($withval) - AC_DEFINE([WITH_THREAD]) -