[oe-commits] org.oe.dev merge of '43c960d45911aef12f2312ce6684bc1c3678b4c1'
rpurdie commit
openembedded-commits at lists.openembedded.org
Thu Mar 6 01:56:54 UTC 2008
merge of '43c960d45911aef12f2312ce6684bc1c3678b4c1'
and 'fd24a981d47c073f1728f3aba7eaabcf9a2ac424'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: e09329acc33076e2c53cf24a4fb7ea0533bb970c
ViewMTN: http://monotone.openembedded.org/revision/info/e09329acc33076e2c53cf24a4fb7ea0533bb970c
Files:
1
packages/libspiff/libspiff_0.7.2.bb
packages/dbus/dbus-1.0.2
packages/dbus/dbus-1.0.3
packages/dbus/dbus-native_1.0.2.bb
packages/dbus/dbus-native_1.0.3.bb
packages/dbus/dbus_1.0.2.bb
packages/dbus/dbus_1.0.3.bb
packages/libspiff/libspiff_0.8.2.bb
packages/libspiff/files/autofoo.patch
packages/xorg-lib/libx11_1.1.2.bb
packages/xorg-lib/libx11_1.1.3.bb
classes/autotools.bbclass
classes/native.bbclass
classes/sdk.bbclass
conf/bitbake.conf
packages/gcc/gcc-package-sdk.inc
packages/gcc/gcc4-build-sdk.inc
packages/zlib/zlib-native_1.2.3.bb
Diffs:
#
# mt diff -r43c960d45911aef12f2312ce6684bc1c3678b4c1 -re09329acc33076e2c53cf24a4fb7ea0533bb970c
#
#
#
# delete "packages/libspiff/libspiff_0.7.2.bb"
#
# rename "packages/dbus/dbus-1.0.2"
# to "packages/dbus/dbus-1.0.3"
#
# rename "packages/dbus/dbus-native_1.0.2.bb"
# to "packages/dbus/dbus-native_1.0.3.bb"
#
# rename "packages/dbus/dbus_1.0.2.bb"
# to "packages/dbus/dbus_1.0.3.bb"
#
# add_file "packages/libspiff/libspiff_0.8.2.bb"
# content [ef70730dd8ab4a23e03e830936613c707dbc2ec9]
#
# patch "packages/libspiff/files/autofoo.patch"
# from [7f9c81a548b9ebb333e7bc7e2031d731483b3377]
# to [a0c00972592d4e7c1d1b8e7e5859d00a94a45b13]
#
# patch "packages/xorg-lib/libx11_1.1.2.bb"
# from [21405491fb1f9d79342a43068804f81e6413482f]
# to [f16ef325f409288bc24e586320ae2628150e2905]
#
# patch "packages/xorg-lib/libx11_1.1.3.bb"
# from [21405491fb1f9d79342a43068804f81e6413482f]
# to [f16ef325f409288bc24e586320ae2628150e2905]
#
============================================================
--- packages/libspiff/libspiff_0.8.2.bb ef70730dd8ab4a23e03e830936613c707dbc2ec9
+++ packages/libspiff/libspiff_0.8.2.bb ef70730dd8ab4a23e03e830936613c707dbc2ec9
@@ -0,0 +1,23 @@
+DESCRIPTION = "libSpiff brings XSPF playlist reading and writing support to your C++ application."
+HOMEPAGE = "http://libspiff.sf.net"
+SECTION = "libs"
+LICENSE = "BSD"
+DEPENDS = "expat liburiparser"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libspiff/libspiff-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libspiff-${PV}"
+
+inherit autotools pkgconfig lib_package
+
+EXTRA_OECONF = "\
+ --with-expat=${STAGING_LIBDIR}/.. \
+ --with-uriparser=${STAGING_LIBDIR}/.. \
+"
+
+CPPFLAGS += "-I${S}/include"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/libspiff/files/autofoo.patch 7f9c81a548b9ebb333e7bc7e2031d731483b3377
+++ packages/libspiff/files/autofoo.patch a0c00972592d4e7c1d1b8e7e5859d00a94a45b13
@@ -1,17 +1,15 @@
-Index: libspiff-0.7.2/configure.in
+Index: libspiff-0.8.2/configure.in
===================================================================
---- libspiff-0.7.2.orig/configure.in 2007-08-25 15:47:29.000000000 +0000
-+++ libspiff-0.7.2/configure.in 2007-08-25 15:47:48.000000000 +0000
-@@ -78,26 +78,6 @@
- LDFLAGS="-L${withval} ${LDFLAGS}"
- ], [])
+--- libspiff-0.8.2.orig/configure.in
++++ libspiff-0.8.2/configure.in
+@@ -80,24 +80,6 @@ AC_ARG_WITH(uriparser-lib, [ --with-uri
--
--
+
+
-# Local headers must come very first. Otherwise we
-# risk including headers of an already installed
-# libSpiff version if its path is in CPPFLAGS
--CPPFLAGS="-Iinclude ${CPPFLAGS}"
+-CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
-
-
-
============================================================
--- packages/xorg-lib/libx11_1.1.2.bb 21405491fb1f9d79342a43068804f81e6413482f
+++ packages/xorg-lib/libx11_1.1.2.bb f16ef325f409288bc24e586320ae2628150e2905
@@ -17,8 +17,6 @@ do_compile() {
(
unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
- # mv to stop it getting rebuilt
- mv makekeys.c makekeys.c.orig
cd ../../
) || exit 1
oe_runmake
============================================================
--- packages/xorg-lib/libx11_1.1.3.bb 21405491fb1f9d79342a43068804f81e6413482f
+++ packages/xorg-lib/libx11_1.1.3.bb f16ef325f409288bc24e586320ae2628150e2905
@@ -17,8 +17,6 @@ do_compile() {
(
unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
- # mv to stop it getting rebuilt
- mv makekeys.c makekeys.c.orig
cd ../../
) || exit 1
oe_runmake
#
# mt diff -rfd24a981d47c073f1728f3aba7eaabcf9a2ac424 -re09329acc33076e2c53cf24a4fb7ea0533bb970c
#
#
#
# patch "classes/autotools.bbclass"
# from [701ff1aa962fc32e4a4625ed4cce861e47ca5694]
# to [aeacc8e494738f08ccc45823750875f08066d297]
#
# patch "classes/native.bbclass"
# from [1b40b57b08d22639dfa0d4f7dd05dc5a77f5d82b]
# to [c184594947a90b6355b13df0e90a4aedb655f19f]
#
# patch "classes/sdk.bbclass"
# from [b90e8104979fb4179078ad646cf8f90830e69014]
# to [2fd6da925d72a7d66eaa4f9817de7c4a9658126f]
#
# patch "conf/bitbake.conf"
# from [40df88348e50c296b273a35f3ff1870b7b20cb0f]
# to [45b49bcfc0ae43467fb81cf6e557fa940512f5cf]
#
# patch "packages/gcc/gcc-package-sdk.inc"
# from [500f25d0e8d3f040092ef2dda341a183764b280a]
# to [dcd9c8472f40a23bfa0060aa1f67edb1d79a3c5b]
#
# patch "packages/gcc/gcc4-build-sdk.inc"
# from [4bccd43b332808cf66e56b0cfcdcc722e35df86c]
# to [78c161edfb4b6933f06b808a83edee6915d33b20]
#
# patch "packages/zlib/zlib-native_1.2.3.bb"
# from [5efec05453989e77f3b4b7023a4504af905de298]
# to [1b8fc689e0475edaa79e0347019704048a64ae80]
#
============================================================
--- classes/autotools.bbclass 701ff1aa962fc32e4a4625ed4cce861e47ca5694
+++ classes/autotools.bbclass aeacc8e494738f08ccc45823750875f08066d297
@@ -17,6 +17,7 @@ def autotools_dep_prepend(d):
deps += 'libtool-native '
if not bb.data.inherits_class('native', d) \
and not bb.data.inherits_class('cross', d) \
+ and not bb.data.inherits_class('sdk', d) \
and not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1):
deps += 'libtool-cross '
============================================================
--- classes/native.bbclass 1b40b57b08d22639dfa0d4f7dd05dc5a77f5d82b
+++ classes/native.bbclass c184594947a90b6355b13df0e90a4aedb655f19f
@@ -1,5 +1,3 @@
-inherit base
-
# Native packages are built indirectly via dependency,
# no need for them to be a direct target of 'world'
EXCLUDE_FROM_WORLD = "1"
============================================================
--- classes/sdk.bbclass b90e8104979fb4179078ad646cf8f90830e69014
+++ classes/sdk.bbclass 2fd6da925d72a7d66eaa4f9817de7c4a9658126f
@@ -6,16 +6,15 @@ HOST_ARCH = "${BUILD_ARCH}"
PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
HOST_ARCH = "${BUILD_ARCH}"
-# This isn't BUILD_VENDOR since we don't want to clash with native staging
-HOST_VENDOR = "${TARGET_VENDOR}"
+HOST_VENDOR = "${BUILD_VENDOR}"
HOST_OS = "${BUILD_OS}"
HOST_PREFIX = "${BUILD_PREFIX}"
HOST_CC_ARCH = "${BUILD_CC_ARCH}"
-CPPFLAGS = "${BUILDSDK_CPPFLAGS}"
-CFLAGS = "${BUILDSDK_CFLAGS}"
-CXXFLAGS = "${BUILDSDK_CFLAGS}"
-LDFLAGS = "${BUILDSDK_LDFLAGS}"
+CPPFLAGS = "${BUILD_CPPFLAGS}"
+CFLAGS = "${BUILD_CFLAGS}"
+CXXFLAGS = "${BUILD_CFLAGS}"
+LDFLAGS = "${BUILD_LDFLAGS}"
# Path prefixes
prefix = "${SDK_PREFIX}"
============================================================
--- conf/bitbake.conf 40df88348e50c296b273a35f3ff1870b7b20cb0f
+++ conf/bitbake.conf 45b49bcfc0ae43467fb81cf6e557fa940512f5cf
@@ -354,12 +354,10 @@ export BUILD_CPPFLAGS = "-isystem${STAGI
##################################################################
export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
-BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR}"
export CPPFLAGS = "${TARGET_CPPFLAGS}"
export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
-BUILDSDK_CFLAGS = "${BUILDSDK_CPPFLAGS} ${BUILD_OPTIMIZATION}"
export CFLAGS = "${TARGET_CFLAGS}"
export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
@@ -371,10 +369,6 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBD
-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \
-Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
-BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
- -Wl,-rpath-link,${STAGING_LIBDIR} \
- -Wl,-rpath,${libdir} -Wl,-O1"
-
export LDFLAGS = "${TARGET_LDFLAGS}"
export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
-Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \
============================================================
--- packages/gcc/gcc-package-sdk.inc 500f25d0e8d3f040092ef2dda341a183764b280a
+++ packages/gcc/gcc-package-sdk.inc dcd9c8472f40a23bfa0060aa1f67edb1d79a3c5b
@@ -1,18 +1,58 @@
-# Packages emitted by our gcc-cross builds.
#
+# Note gcc-package.inc was already included before us.
+#
+# We override PACKAGES and FILES to change the packaging
+#
+
INHIBIT_PACKAGE_STRIP ?= ""
+HAS_G2C ?= "yes"
+HAS_GFORTRAN ?= "no"
OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
INHIBIT_PACKAGE_STRIP = "1"
-python do_package() {
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bb.data.setVar('PKG_libgcc', 'libgcc1', d)
- bb.build.exec_func('package_do_package', d)
-}
+# Having anything auto depending on gcc-cross-sdk is a really bad idea...
+EXCLUDE_FROM_SHLIBS = "1"
+PACKAGES = "${PN} ${PN}-doc"
+
+FILES_${PN} = "\
+ ${bindir}/* \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+ ${includedir}/c++/${BINV} \
+ ${prefix}/${TARGET_SYS}/bin/* \
+ ${prefix}/${TARGET_SYS}/lib/* \
+ "
do_install () {
oe_runmake 'DESTDIR=${D}' install
+ # Cleanup some of the ${libdir}{,exec}/gcc stuff ...
+ rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+ rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+
+ # We care about g++ not c++
+ rm -f ${D}${bindir}/*c++
+
+ # We don't care about the gcc-<version> copies
+ rm -f ${D}${bindir}/*gcc-?.?*
+
+ # We use libiberty from binutils
+ rm -f ${D}${prefix}/${TARGET_SYS}/lib/libiberty.a
+ rm -f ${D}${libdir}/libiberty.a
+
+ # Create the ${prefix}/${TARGET_SYS}/bin/* symlinks
+ install -d ${D}${prefix}/${TARGET_SYS}/bin/
+ for l in ${D}${bindir}/*; do
+ ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`"
+ done
+ ln -sf "${bindir}/${TARGET_PREFIX}gcc" "${D}${prefix}/${TARGET_SYS}/bin/cc"
+
# Manually run the target stripper since we won't get it run by
# the packaging.
if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
@@ -22,15 +62,3 @@ do_install () {
fi
}
-FILES_libgcc = "${prefix}/${TARGET_SYS}/lib/libgcc*.so.*"
-FILES_libgcc-dev = "${prefix}/${TARGET_SYS}/lib/libgcc*.so"
-
-FILES_libstdc++ = "${prefix}/${TARGET_SYS}/lib/libstdc++.so.*"
-FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
- ${prefix}/${TARGET_SYS}/lib/libstdc++.so \
- ${prefix}/${TARGET_SYS}/lib/libstdc++.a \
- ${prefix}/${TARGET_SYS}/lib/libsupc++.a"
-
-FILES_libmudflap = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so.*"
-FILES_libmudflap-dev = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so \
- ${prefix}/${TARGET_SYS}/lib/libmudflap*.a"
============================================================
--- packages/gcc/gcc4-build-sdk.inc 4bccd43b332808cf66e56b0cfcdcc722e35df86c
+++ packages/gcc/gcc4-build-sdk.inc 78c161edfb4b6933f06b808a83edee6915d33b20
@@ -1,12 +1,40 @@ USE_NLS = '${@base_conditional( "TARGET_
USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
-EXTRA_OECONF += "--with-sysroot=${prefix}/${TARGET_SYS} --with-build-sysroot=${STAGING_DIR_TARGET}"
+EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+ --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \
+ --with-sysroot=${prefix}/${TARGET_SYS} \
+ --with-build-sysroot=${STAGING_DIR_TARGET}"
+#
+# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky
+# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse.
+#
+export AR_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ar"
+export AS_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/as"
+export DLLTOOL_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/dlltool"
+export LD_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ld"
+export LIPO_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/lipo"
+export NM_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/nm"
+export OBJDUMP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/objdump"
+export RANLIB_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ranlib"
+export STRIP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/strip"
+export WINDRES_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/windres"
+
+#
+# We need to override this and make sure the compiler can find staging
+#
+export ARCH_FLAGS_FOR_TARGET = "--sysroot=/media/build1/builds/oe/angstrom/tmp/staging/arm-angstrom-linux-gnueabi"
+
do_configure () {
- (cd ${S} && gnu-configize) || die "failure running gnu-configize"
- (cd ${S}/libstdc++-v3 && autoreconf)
- oe_runconf
+ export CC_FOR_BUILD="${BUILD_CC}"
+ export CXX_FOR_BUILD="${BUILD_CXX}"
+ export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+ export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
+ export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
+ export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
+ (cd ${S} && gnu-configize) || die "failure running gnu-configize"
+ oe_runconf
}
do_compile () {
@@ -16,5 +44,5 @@ do_compile () {
export LD_FOR_TARGET="${TARGET_SYS}-ld"
export NM_FOR_TARGET="${TARGET_SYS}-nm"
export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc ${TARGET_CC_ARCH}"
- oe_runmake
+ base_do_compile
}
============================================================
--- packages/zlib/zlib-native_1.2.3.bb 5efec05453989e77f3b4b7023a4504af905de298
+++ packages/zlib/zlib-native_1.2.3.bb 1b8fc689e0475edaa79e0347019704048a64ae80
@@ -1,4 +1,3 @@
-SECTION = "libs"
require zlib_${PV}.bb
ZLIB_EXTRA = ""
inherit native
More information about the Openembedded-commits
mailing list