diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-07-22 17:59:49 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-22 17:59:49 +0000 |
commit | 84584be160dc89d9d06ea6e0f1f654b351d494d3 (patch) | |
tree | 341b6ecf30f67be470b8d1253f2fd7aff48aeb11 /packages | |
parent | c73d8c4f5ddbd976139f3752590a133e779468d7 (diff) | |
parent | cc024114e7d396670e3d62a599c61bf82db31fee (diff) |
merge of 2933613fafe3ac2d994543bb7f22239bb1b339a8
and c01db26784f543ae5912fe2d58bb400f3e8d3f86
Diffstat (limited to 'packages')
-rw-r--r-- | packages/gcc/gcc-cross-sdk_3.3.4.bb | 43 | ||||
-rw-r--r-- | packages/gnome/gconf-dbus_cvs.bb | 5 | ||||
-rw-r--r-- | packages/gpsdrive/gpsdrive_cvs.bb | 32 | ||||
-rw-r--r-- | packages/meta/meta-sdk.bb | 13 |
4 files changed, 81 insertions, 12 deletions
diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb index 562f67114a..e298b1caa1 100644 --- a/packages/gcc/gcc-cross-sdk_3.3.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb @@ -3,7 +3,11 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR = "r1" +PR = "r2" +include gcc_${PV}.bb + +# Files for these are defined in the main gcc.oe +#PACKAGES = "libgcc libstdc++ libg2c" inherit autotools sdk @@ -75,6 +79,39 @@ do_compile () { oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}" } -do_install () { - autotools_do_install +#do_install () { +# autotools_do_install +#} + +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) } + +do_install () { + oe_runmake 'DESTDIR=${D}' install + + # Move libgcc_s into /lib + mkdir -p ${D}${base_libdir} + if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then + # native builds drop one pathname component + mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir} + else + mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir} + fi + + # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr + TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'` + mkdir -p ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR} + + # Manually run the target stripper since we won't get it run by + # the packaging. + if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.* + ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* + fi +}
\ No newline at end of file diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb index 71ff770f52..a403fae24c 100644 --- a/packages/gnome/gconf-dbus_cvs.bb +++ b/packages/gnome/gconf-dbus_cvs.bb @@ -4,10 +4,11 @@ DESCRIPTION = "Settings daemon using DBUS for communication." LICENSE = "GPL" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" PROVIDES = "gconf" -RPROVIDES = "gconf" +RPROVIDES_${PN} = "gconf" +RPROVIDES_${PN}-dev = "gconf-dev" PV = "0.0cvs${CVSDATE}" -PR = "r5" +PR = "r6" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \ file://gconf-dbus-update.patch;patch=1;pnum=0 \ diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb new file mode 100644 index 0000000000..cc623451ef --- /dev/null +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -0,0 +1,32 @@ +inherit autotools pkgconfig + +PR = "r0" +PV = "2.10pre3+cvs-${CVSDATE}" +DEFAULT_PREFERENCE="-1" + +PACKAGES += "gpsdrive-add" +DESCRIPTION = "GPS navigation/map display software" +DEPENDS = "virtual/libc gtk+ pcre gpsd" +RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +SECTION = "x11" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "cvs://anonymous@cvs.gpsdrive.cc/cvsroot;module=gpsdrive \ + file://gpsdrive.desktop" + +S = "${WORKDIR}/gpsdrive" +CFLAGS += "-D_GNU_SOURCE" + +FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN} += "${datadir}/${PN}" + +FILES_gpsdrive-add = "${libdir}" + +EXTRA_OECONF = "--disable-garmin" + +do_install_append () { + mkdir -p ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop +} diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index 757c72ecb3..962572d546 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -1,6 +1,7 @@ -PR = "r2" +PR = "r3" DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe" +DEPENDS += "libidl libsvg-cairo" PACKAGES = "" @@ -19,7 +20,7 @@ compositeext-dev \ damageext-dev \ dbus-dev \ fixesext-dev \ -gconf-dev \ +gconf-dbus-dev \ gtk+-dev \ gtk-engines-dev \ libapm-dev \ @@ -86,17 +87,15 @@ libxtst-dev \ libz-dev \ matchbox-desktop-dev \ ncurses-dev \ -orbit2-dev \ pango-dev \ randrext-dev \ recordext-dev \ renderext-dev \ resourceext-dev \ -rxvt-unicode-dev \ -wireless-tools-dev \ +libiw-dev \ xcalibrateext-dev \ xextensions-dev \ -xmu-dev \ +libxmu-dev \ xproto-dev \ xtrans-dev \ " @@ -148,7 +147,7 @@ EOF echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${libdir}/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status rm -rf ${SDK_OUTPUT}${libdir}/ipkg # remove unwanted executables |