[oe-commits] org.oe.dev merge of '383183a2b07cc7894a0c38bf198acc5f5f97fec1'
hrw commit
openembedded-commits at lists.openembedded.org
Mon Mar 17 08:45:14 UTC 2008
merge of '383183a2b07cc7894a0c38bf198acc5f5f97fec1'
and 'c8a04b4c21aa3cccc256c033dc9532d6dc88be53'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: c27f12b6201add4768a4f1450013d29f80a554ef
ViewMTN: http://monotone.openembedded.org/revision/info/c27f12b6201add4768a4f1450013d29f80a554ef
Files:
1
packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch
classes/qmake2.bbclass
classes/qtopia4core.bbclass
conf/bitbake.conf
packages/gcc/gcc-cross-initial.inc
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
packages/qt4/qtopia-core.inc
packages/uclibc/uclibc_0.9.29.bb
Diffs:
#
# mt diff -r383183a2b07cc7894a0c38bf198acc5f5f97fec1 -rc27f12b6201add4768a4f1450013d29f80a554ef
#
#
#
# add_file "packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch"
# content [d1d87a1d45487ab3992cb1b898e57bb621192a8d]
#
# patch "classes/qmake2.bbclass"
# from [e469f74476f5cd684b559146bbd4e808de9dcadb]
# to [8079b5564afd7c19bbc0088e21ca4e780a85b65f]
#
# patch "classes/qtopia4core.bbclass"
# from [b1d6e66685818c4024d7bfabaf21b47344f94360]
# to [9e44d07549e666bc39b473d49004ee2a271a4f3e]
#
# patch "conf/bitbake.conf"
# from [45b49bcfc0ae43467fb81cf6e557fa940512f5cf]
# to [70cb68395c739ccdb760bd8420dc346bf585df73]
#
# patch "packages/gcc/gcc-cross-initial.inc"
# from [9ba43750cd0139966a6dcf2b4103056bf5ff486a]
# to [3169e83832ff092444d8ebefd61421998dbb8520]
#
# patch "packages/qt4/qt4-x11-free.inc"
# from [0491ae6474b77420c831961ea9d0189c7855246f]
# to [89c46cc5b77c68a9396f847011f40dda890459a6]
#
# patch "packages/qt4/qt_packaging.inc"
# from [10c4b21735e8cff175978c971577e1cac4681cad]
# to [39f09b583e2e9f61e01f5d75bf57e75690501ed4]
#
# patch "packages/qt4/qt_staging.inc"
# from [b81c5a4e9f78f1662d4253ad44815f912e81341c]
# to [f74af3775f1a2c2fb8670eca49ab7c2a89d91a53]
#
# patch "packages/qt4/qtopia-core.inc"
# from [fc58fe163d3e9b307c022e25b992732deff4a115]
# to [ece71d23b6e95ccfa2dd065273aa0b93013c811a]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [fbb16deda11e2a7ee5fd50b757a8cc92d0bb3294]
# to [3425ad6998ad40cbf49c5bd4b2ed1991f9232f23]
#
============================================================
--- packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch d1d87a1d45487ab3992cb1b898e57bb621192a8d
+++ packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch d1d87a1d45487ab3992cb1b898e57bb621192a8d
@@ -0,0 +1,13 @@
+Index: uClibc-0.9.29/extra/config/lxdialog/check-lxdialog.sh
+===================================================================
+--- uClibc-0.9.29.orig/extra/config/lxdialog/check-lxdialog.sh 2008-03-09 21:58:29.000000000 +0100
++++ uClibc-0.9.29/extra/config/lxdialog/check-lxdialog.sh 2008-03-09 21:58:39.000000000 +0100
+@@ -57,7 +57,7 @@
+ printf "Usage: $0 [-check compiler options|-header|-library]\n"
+ }
+
+-if [ $# == 0 ]; then
++if [ $# -eq 0 ]; then
+ usage
+ exit 1
+ fi
============================================================
--- classes/qmake2.bbclass e469f74476f5cd684b559146bbd4e808de9dcadb
+++ classes/qmake2.bbclass 8079b5564afd7c19bbc0088e21ca4e780a85b65f
@@ -14,6 +14,6 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_I
export OE_QMAKE_LINK = "${CXX}"
export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
-export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
export OE_QMAKE_LIBS_QT = "qt"
export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
============================================================
--- classes/qtopia4core.bbclass b1d6e66685818c4024d7bfabaf21b47344f94360
+++ classes/qtopia4core.bbclass 9e44d07549e666bc39b473d49004ee2a271a4f3e
@@ -5,7 +5,7 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_I
# override variables set by qmake-base to compile QtopiaCore apps
#
export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia"
-export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopia"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
export OE_QMAKE_LIBS_QT = "qt"
export OE_QMAKE_LIBS_X11 = ""
export OE_QMAKE_EXTRA_MODULES = "network"
============================================================
--- conf/bitbake.conf 45b49bcfc0ae43467fb81cf6e557fa940512f5cf
+++ conf/bitbake.conf 70cb68395c739ccdb760bd8420dc346bf585df73
@@ -203,10 +203,11 @@ CACHE = "${TMPDIR}/cache${@['', '/' + st
TMPDIR = "${TOPDIR}/tmp"
CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
-CVSDIR = "${DL_DIR}/cvs"
-SVNDIR = "${DL_DIR}/svn"
-GITDIR = "${DL_DIR}/git"
-BZRDIR = "${DL_DIR}/bzr"
+CO_DIR = "${DL_DIR}"
+CVSDIR = "${CO_DIR}/cvs"
+SVNDIR = "${CO_DIR}/svn"
+GITDIR = "${CO_DIR}/git"
+BZRDIR = "${CO_DIR}/bzr"
STAMP = "${TMPDIR}/stamps/${PF}"
WORKDIR = "${TMPDIR}/work/${PF}"
============================================================
--- packages/gcc/gcc-cross-initial.inc 9ba43750cd0139966a6dcf2b4103056bf5ff486a
+++ packages/gcc/gcc-cross-initial.inc 3169e83832ff092444d8ebefd61421998dbb8520
@@ -1,5 +1,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binut
DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
+# @todo Please add comment on why this is (still?) needed?
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel', 'powerpc']]}"
PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
PACKAGES = ""
============================================================
--- packages/qt4/qt4-x11-free.inc 0491ae6474b77420c831961ea9d0189c7855246f
+++ packages/qt4/qt4-x11-free.inc 89c46cc5b77c68a9396f847011f40dda890459a6
@@ -5,7 +5,7 @@ PROVIDES = "qt4x11"
LICENSE = "GPL QPL"
DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
PROVIDES = "qt4x11"
-PR = "r8"
+PR = "r9"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
file://0001-cross-compile.patch;patch=1 \
============================================================
--- packages/qt4/qt_packaging.inc 10c4b21735e8cff175978c971577e1cac4681cad
+++ packages/qt4/qt_packaging.inc 39f09b583e2e9f61e01f5d75bf57e75690501ed4
@@ -177,6 +177,15 @@ do_install() {
rm -rf ${D}/${bindir}/${QT_DIR_NAME}
rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs
+ # fix some .la and .pc files
+ sed -i s#"moc_location=${STAGING_BINDIR}/moc4$"#"moc_location=${bindir}/moc4"# ${D}/${libdir}/pkgconfig/Qt*.pc
+ sed -i s#"uic_location=${STAGING_BINDIR}/uic4$"#"uic_location=${bindir}/uic4"# ${D}/${libdir}/pkgconfig/Qt*.pc
+ sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g ${D}/${libdir}/pkgconfig/Qt*.pc
+ sed -i s#-L${STAGING_LIBDIR}##g ${D}${libdir}/pkgconfig/Qt*.pc
+
+ sed -i s#-L${STAGING_LIBDIR}#-L${libdir}#g ${D}${libdir}/libQt*.la
+ sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g ${D}/${libdir}/libQt*.la
+
install -d ${D}/${libdir}/fonts
touch ${D}/${libdir}/fonts/fontdir
}
============================================================
--- packages/qt4/qt_staging.inc b81c5a4e9f78f1662d4253ad44815f912e81341c
+++ packages/qt4/qt_staging.inc f74af3775f1a2c2fb8670eca49ab7c2a89d91a53
@@ -2,11 +2,12 @@ do_stage_append() {
do_stage_append() {
cd ${STAGING_LIBDIR}/pkgconfig
sed -i s#"-L${S}/lib"##g Qt*.pc
- sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc
- sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc
- sed -i s#libdir=\$\{prefix\}/lib#libdir=\$\{prefix\}/lib/${QT_DIR_NAME}#g Qt*.pc
+ sed -i s#"moc_location=${STAGING_BINDIR}/moc4$"## Qt*.pc
+ sed -i s#"uic_location=${STAGING_BINDIR}/uic4$"## Qt*.pc
+ sed -i s#"-L${STAGING_LIBDIR}"##g Qt*.pc
+ sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g Qt*.pc
- cd ${STAGING_LIBDIR}/${QT_DIR_NAME}
+ cd ${STAGING_LIBDIR}
sed -i s#"-L${S}/lib"##g libQt*.la
}
@@ -17,7 +18,7 @@ do_stage() {
oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
install -d ${STAGING_INCDIR}/
- install -d ${STAGING_LIBDIR}/${QT_DIR_NAME}
+ install -d ${STAGING_LIBDIR}
cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/
for i in ${STAGE_TEMP}/${libdir}/*.la
@@ -25,19 +26,19 @@ do_stage() {
sed -i s,installed=yes,installed=no, $i
sed -i -e "/^dependency_libs=/s,-L${libdir},-L${STAGING_LIBDIR},g" $i
sed -i -e "s,-L${libdir},-L${STAGING_LIBDIR},g" ${STAGE_TEMP}/${libdir}/$(basename $i .la).prl
- cp -fpPR $i ${STAGING_LIBDIR}/${QT_DIR_NAME}/
- cp -fpPR ${STAGE_TEMP}/${libdir}/$(basename $i .la).prl ${STAGING_LIBDIR}/${QT_DIR_NAME}
- oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/${QT_DIR_NAME}
+ cp -fpPR $i ${STAGING_LIBDIR}
+ cp -fpPR ${STAGE_TEMP}/${libdir}/$(basename $i .la).prl ${STAGING_LIBDIR}
+ oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}
done
for i in libQtAssistantClient${QT_LIBINFIX} libQtDesignerComponents${QT_LIBINFIX} libQtUiTools${QT_LIBINFIX} libQtUiTools${QT_LIBINFIX} libQtDesigner${QT_LIBINFIX}
do
sed -i -e "s,-L${libdir},-L${STAGING_LIBDIR},g" $i.prl || true
- cp ${STAGE_TEMP}/${libdir}/$i.prl ${STAGING_LIBDIR}/${QT_DIR_NAME} || true
+ cp ${STAGE_TEMP}/${libdir}/$i.prl ${STAGING_LIBDIR} || true
sed -i -e "/^dependency_libs=/s,-L${libdir},-L${STAGING_LIBDIR},g" $i.la || true
- cp ${STAGE_TEMP}/${libdir}/$i.la ${STAGING_LIBDIR}/${QT_DIR_NAME} || true
- oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $i ${STAGING_LIBDIR}/${QT_DIR_NAME} || true
- oe_libinstall -C ${STAGE_TEMP}/${libdir} -a $i ${STAGING_LIBDIR}/${QT_DIR_NAME} || true
+ cp ${STAGE_TEMP}/${libdir}/$i.la ${STAGING_LIBDIR} || true
+ oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $i ${STAGING_LIBDIR} || true
+ oe_libinstall -C ${STAGE_TEMP}/${libdir} -a $i ${STAGING_LIBDIR} || true
done
rm -rf ${STAGE_TEMP}
============================================================
--- packages/qt4/qtopia-core.inc fc58fe163d3e9b307c022e25b992732deff4a115
+++ packages/qt4/qtopia-core.inc ece71d23b6e95ccfa2dd065273aa0b93013c811a
@@ -4,7 +4,7 @@ DEPENDS += "tslib"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS += "tslib"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
file://qconfig-oe.h \
============================================================
--- packages/uclibc/uclibc_0.9.29.bb fbb16deda11e2a7ee5fd50b757a8cc92d0bb3294
+++ packages/uclibc/uclibc_0.9.29.bb 3425ad6998ad40cbf49c5bd4b2ed1991f9232f23
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
# on whether the base patches apply to the selected (SRCDATE) svn release.
#
UCLIBC_BASE ?= "0.9.29"
-PR = "r9"
+PR = "r11"
require uclibc.inc
@@ -23,7 +23,8 @@ SRC_URI += "file://uClibc.machine file:/
file://uClibc-0.9.29-fix-gethostent_r-failure-retval.patch;patch=1 \
file://uClibc-0.9.29-fix-internal_function-definition.patch;patch=1 \
file://uClibc-0.9.29-rm-whitespace.patch;patch=1 \
- "
+ file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \
+"
# mmap-unsigned-shift_bugid1303.patch
# http://uclibc.org/lists/uclibc-cvs/2007-May/011360.html;patch=1"
#
# mt diff -rc8a04b4c21aa3cccc256c033dc9532d6dc88be53 -rc27f12b6201add4768a4f1450013d29f80a554ef
#
#
# no changes
#
More information about the Openembedded-commits
mailing list