diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-09-13 19:47:16 +0000 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-09-13 19:47:16 +0000 |
| commit | f16e56319742656189dcedf251bd2ea390d17c03 (patch) | |
| tree | da6fc09cbe15b76b6bb9eda5201cd5e13e7f94cd /recipes | |
| parent | 848446695abfdb3d3631d70ece7e74311f26d37c (diff) | |
| parent | 34e6a1ce23f1ef5f627447286c4ae768d8bcb1ad (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
108 files changed, 11688 insertions, 965 deletions
diff --git a/recipes/binutils/binutils-cross.inc b/recipes/binutils/binutils-cross.inc index 384d18cfa7..5808c1fbda 100644 --- a/recipes/binutils/binutils-cross.inc +++ b/recipes/binutils/binutils-cross.inc @@ -22,13 +22,6 @@ do_stage () { rmdir ${CROSS_DIR}/${libdir} || : rmdir ${CROSS_DIR}/${libdir}64 || : rmdir ${CROSS_DIR}/${prefix} || : - - # We want to move this into the target specific location - mkdir -p ${STAGING_DIR_TARGET}/lib - mv -f ${CROSS_DIR}/lib/libiberty.a ${STAGING_DIR_TARGET}/lib || \ - mv -f ${CROSS_DIR}/lib64/libiberty.a ${STAGING_DIR_TARGET}/lib - rmdir ${CROSS_DIR}/lib || : - rmdir ${CROSS_DIR}/lib64 || : } do_install () { diff --git a/recipes/binutils/binutils_cvs.bb b/recipes/binutils/binutils_cvs.bb index ad4dd2b474..b335767687 100644 --- a/recipes/binutils/binutils_cvs.bb +++ b/recipes/binutils/binutils_cvs.bb @@ -1,5 +1,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" -PV = "0.0+cvs${SRCDATE}" +PV = "2.20+cvs${SRCDATE}" INC_PR = "r5" PR = "${INC_PR}.1" @@ -21,8 +21,34 @@ do_compile () { oe_runmake all-ld all-binutils all-gas } do_install () { - oe_runmake install-ld install-binutils install-gas + oe_runmake 'DESTDIR=${D}' install-ld install-binutils install-gas + + # We don't really need these, so we'll remove them... + rm -rf ${D}${libdir}/ldscripts + + # Fix the /usr/${TARGET_SYS}/bin/* links + for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do + rm -f $l + ln -sf `echo ${prefix}/${TARGET_SYS}/bin \ + | tr -s / \ + | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l + done + + # Install the libiberty header + install -d ${D}${includedir} + install -m 644 ${S}/include/ansidecl.h ${D}${includedir} + install -m 644 ${S}/include/libiberty.h ${D}${includedir} + + cd ${D}${bindir} + + # Symlinks for ease of running these on the native target + for p in ${TARGET_SYS}-* ; do + ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,` + done + + rm ${D}${bindir}/ar ${D}${bindir}/strings } + do_stage () { oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/ oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/ diff --git a/recipes/cairo/cairo_git.bb b/recipes/cairo/cairo_git.bb index 44212103a6..825b601897 100644 --- a/recipes/cairo/cairo_git.bb +++ b/recipes/cairo/cairo_git.bb @@ -1,5 +1,6 @@ #This is a development snapshot, so lets hint OE to use the releases DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" SECTION = "libs" PRIORITY = "optional" @@ -7,7 +8,10 @@ DEPENDS = "pixman virtual/libx11 libsm libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" -PV = "1.5.3+git${SRCDATE}" +SRCREV = "3acccf0ea5ca1fde9cf6b91677588680a2644ee6" + +PV = "1.9.3" +PR_append = "+gitr${SRCREV}" SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \ " diff --git a/recipes/cherokee/cherokee.inc b/recipes/cherokee/cherokee.inc index 58ffe1ac94..16ecfbfe1f 100644 --- a/recipes/cherokee/cherokee.inc +++ b/recipes/cherokee/cherokee.inc @@ -4,6 +4,7 @@ HOMEPAGE = "http://www.cherokee-project.com/" SECTION = "network" LICENSE = "GPL" DEPENDS = "libpcre gnutls" +INC_PR = "r7" SRC_URI = "http://www.cherokee-project.com/download/0.5/${PV}/cherokee-${PV}.tar.gz \ file://cherokee.init " diff --git a/recipes/cherokee/cherokee_0.4.29.bb b/recipes/cherokee/cherokee_0.4.29.bb index 42eae684e7..a2c43e3c78 100644 --- a/recipes/cherokee/cherokee_0.4.29.bb +++ b/recipes/cherokee/cherokee_0.4.29.bb @@ -8,7 +8,7 @@ SRC_URI = "http://www.0x50.org/download/0.4/${PV}/${P}.tar.gz \ file://Makefile.in.patch;patch=1 \ file://Makefile.cget.patch;patch=1 \ file://util.patch;patch=1" -PR = "r1" +PR = "${INC_PR}.0" inherit autotools diff --git a/recipes/cherokee/cherokee_0.5.3.bb b/recipes/cherokee/cherokee_0.5.3.bb index 1fe9df46c0..a6e14e75c8 100644 --- a/recipes/cherokee/cherokee_0.5.3.bb +++ b/recipes/cherokee/cherokee_0.5.3.bb @@ -1,11 +1,10 @@ -PR = "r7" - SRC_URI_append = "file://configure.patch;patch=1 \ file://Makefile.in.patch;patch=1 \ |