diff options
| -rw-r--r-- | openembedded/classes/base.bbclass | 8 | ||||
| -rw-r--r-- | openembedded/classes/qt3x11.bbclass | 20 | ||||
| -rw-r--r-- | openembedded/classes/qt4x11.bbclass | 25 | ||||
| -rw-r--r-- | openembedded/site/arm-linux-gnueabi | 8 |
4 files changed, 37 insertions, 24 deletions
diff --git a/openembedded/classes/base.bbclass b/openembedded/classes/base.bbclass index 1728b6570..5f0e0d2fc 100644 --- a/openembedded/classes/base.bbclass +++ b/openembedded/classes/base.bbclass @@ -196,7 +196,7 @@ oe_libinstall() { # stop libtool using the final directory name for libraries # in staging: __runcmd rm -f $destpath/$libname.la - __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,' $dotlai >$destpath/$libname.la + __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la else __runcmd install -m 0644 $dotlai $destpath/$libname.la fi @@ -513,15 +513,15 @@ python base_eventhandler() { if name.startswith("BuildStarted"): bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 ) - path_to_packages = path_to_bbfiles[:path_to_bbfiles.index( "packages" )] + path_to_packages = path_to_bbfiles[:path_to_bbfiles.rindex( "packages" )] monotone_revision = "<unknown>" try: monotone_revision = file( "%s/MT/revision" % path_to_packages ).read().strip() except IOError: pass bb.data.setVar( 'OE_REVISION', monotone_revision, e.data ) - statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'TARGET_FPU'] - statuslines = ["%-13s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] + statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU'] + statuslines = ["%-14s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines) print statusmsg diff --git a/openembedded/classes/qt3x11.bbclass b/openembedded/classes/qt3x11.bbclass index 09b9cbac9..6e3d5f8ba 100644 --- a/openembedded/classes/qt3x11.bbclass +++ b/openembedded/classes/qt3x11.bbclass @@ -1,11 +1,15 @@ +DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}" +EXTRA_QMAKEVARS_POST += "CONFIG+=thread" # # override variables set by qmake-base to compile Qt/X11 apps # -export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt3" -export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3" -export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3" -export OE_QMAKE_CXXFLAGS="${CXXFLAGS} -DQT_NO_XIM" -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_LIBS_QT="qt" -export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm" +export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3" +export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic3" +export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc3" +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM" +export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" +export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_LIBS_QT = "qt" +export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" + + diff --git a/openembedded/classes/qt4x11.bbclass b/openembedded/classes/qt4x11.bbclass index 04aff565b..635fc6769 100644 --- a/openembedded/classes/qt4x11.bbclass +++ b/openembedded/classes/qt4x11.bbclass @@ -1,16 +1,17 @@ DEPENDS_prepend = "qmake2-native " +DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}" # # override variables set by qmake-base to compile Qt4/X11 apps # -export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt4" -export QMAKESPEC="${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" -export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4" -export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4" -export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4" -export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake2" -export OE_QMAKE_LINK="${CXX}" -export OE_QMAKE_CXXFLAGS="${CXXFLAGS}" -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_LIBS_QT="qt" -export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm" +export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" +export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" +export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic4" +export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc4" +export OE_QMAKE_RCC = "${STAGING_BINDIR}/rcc4" +export OE_QMAKE_QMAKE = "${STAGING_BINDIR}/qmake2" +export OE_QMAKE_LINK = "${CXX}" +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" +export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" +export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_LIBS_QT = "qt" +export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" diff --git a/openembedded/site/arm-linux-gnueabi b/openembedded/site/arm-linux-gnueabi index aff569c01..7c9fb85d0 100644 --- a/openembedded/site/arm-linux-gnueabi +++ b/openembedded/site/arm-linux-gnueabi @@ -367,3 +367,11 @@ with_broken_putenv=${with_broken_putenv=no} # xffm jm_cv_func_working_readdir=yes + +# dpkg +dpkg_cv_va_copy=${ac_cv_va_copy=no} +dpkg_cv___va_copy=${ac_cv___va_copy=yes} + +# enca +yeti_cv_func_scanf_modif_size_t=yes + |