diff options
63 files changed, 106 insertions, 153 deletions
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index 18aee09a26..fa34565eaf 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -13,16 +13,15 @@ distutils_do_compile() { } distutils_stage_headers() { - install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages + install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ oefatal "python setup.py install_headers execution failed." } distutils_stage_all() { - install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages - # is this missing a lib below? - PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \ + install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages + PYTHONPATH=${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ oefatal "python setup.py install (stage) execution failed." diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 1a3622c3bb..22b6166685 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -28,7 +28,7 @@ python do_package_deb_install () { pkgfn = bb.data.getVar('PKGFN', d, 1) rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) debdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1) - stagingdir = bb.data.getVar('STAGING_DIR', d, 1) + apt_config = bb.data.expand('${STAGING_ETCDIR_NATIVE}/apt/apt.conf', d) stagingbindir = bb.data.getVar('STAGING_BINDIR_NATIVE', d, 1) tmpdir = bb.data.getVar('TMPDIR', d, 1) @@ -55,7 +55,7 @@ python do_package_deb_install () { # Set up environment apt_config_backup = os.getenv('APT_CONFIG') - os.putenv('APT_CONFIG', os.path.join(stagingdir, 'etc', 'apt', 'apt.conf')) + os.putenv('APT_CONFIG', apt_config) path = os.getenv('PATH') os.putenv('PATH', '%s:%s' % (stagingbindir, os.getenv('PATH'))) diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index c2c4a764e4..5237285e4c 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -10,12 +10,8 @@ fakeroot rootfs_deb_do_rootfs () { mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates - mkdir -p ${STAGING_ETCDIR_NATIVE}/apt/ - rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences - > ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev - > ${STAGING_ETCDIR_NATIVE}/apt/preferences > ${IMAGE_ROOTFS}/var/dpkg/status > ${IMAGE_ROOTFS}/var/dpkg/available # > ${STAGING_DIR}/var/dpkg/status @@ -40,9 +36,9 @@ fakeroot rootfs_deb_do_rootfs () { priority=$(expr $priority + 5) done - tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list + tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list - cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \ + cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ | sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \ > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf" diff --git a/packages/apt/apt-native_0.6.46.2.bb b/packages/apt/apt-native_0.6.46.2.bb index 43f73889f7..3342618aa9 100644 --- a/packages/apt/apt-native_0.6.46.2.bb +++ b/packages/apt/apt-native_0.6.46.2.bb @@ -1,4 +1,5 @@ require apt-native.inc +PR = "r1" SRC_URI += "file://nodoc.patch;patch=1 \ file://noconfigure.patch;patch=1" diff --git a/packages/apt/apt-native_0.7.2.bb b/packages/apt/apt-native_0.7.2.bb index 3342618aa9..6db567f987 100644 --- a/packages/apt/apt-native_0.7.2.bb +++ b/packages/apt/apt-native_0.7.2.bb @@ -1,5 +1,5 @@ require apt-native.inc -PR = "r1" +PR = "r2" SRC_URI += "file://nodoc.patch;patch=1 \ file://noconfigure.patch;patch=1" diff --git a/packages/apt/apt-native_0.7.3.bb b/packages/apt/apt-native_0.7.3.bb index 6db567f987..7bf69c01af 100644 --- a/packages/apt/apt-native_0.7.3.bb +++ b/packages/apt/apt-native_0.7.3.bb @@ -1,5 +1,5 @@ require apt-native.inc -PR = "r2" +PR = "r3" SRC_URI += "file://nodoc.patch;patch=1 \ file://noconfigure.patch;patch=1" diff --git a/packages/apt/files/apt.conf b/packages/apt/files/apt.conf index 9e90616465..2bd9ddbfaf 100644 --- a/packages/apt/files/apt.conf +++ b/packages/apt/files/apt.conf @@ -1,4 +1,4 @@ -Dir "${STAGING_DIR}/" +Dir "${STAGING_DIR_NATIVE}/" { State "var/lib/apt/" { diff --git a/packages/ark3116/ark3116_0.4.1.bb b/packages/ark3116/ark3116_0.4.1.bb index 89bcfa85d9..629c50a3ca 100644 --- a/packages/ark3116/ark3116_0.4.1.bb +++ b/packages/ark3116/ark3116_0.4.1.bb @@ -25,8 +25,8 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" +export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ + -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir}" do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/serial diff --git a/packages/avr-libc/avr-libc_1.0.3.bb b/packages/avr-libc/avr-libc_1.0.3.bb index 1c627a1576..20a2850958 100644 --- a/packages/avr-libc/avr-libc_1.0.3.bb +++ b/packages/avr-libc/avr-libc_1.0.3.bb @@ -22,12 +22,13 @@ prefix = "${CROSS_DIR}" exec_prefix = "${prefix}" do_stage () { -# install into CROSS_DIR + # install into CROSS_DIR oe_runmake install -# install into STAGING_DIR - oe_runmake "prefix=${STAGING_DIR}" "exec_prefix=${STAGING_DIR}" \ + # install into staging + oe_runmake "prefix=${STAGING_DIR_HOST}${layout_prefix}" \ + "exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" \ "bindir=${STAGING_BINDIR}" "libdir=${STAGING_LIBDIR}" \ - "tooldir=${STAGING_DIR}" "toolibdir=${STAGING_LIBDIR}" \ + "tooldir=${STAGING_DIR_HOST}" "toolibdir=${STAGING_LIBDIR}" \ install } diff --git a/packages/cairo/libsvg-cairo_0.1.5.bb b/packages/cairo/libsvg-cairo_0.1.5.bb index 9cee27bf29..add660752a 100644 --- a/packages/cairo/libsvg-cairo_0.1.5.bb +++ b/packages/cairo/libsvg-cairo_0.1.5.bb @@ -9,5 +9,5 @@ SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/cairo/libsvg-cairo_0.1.6.bb b/packages/cairo/libsvg-cairo_0.1.6.bb index 9cee27bf29..add660752a 100644 --- a/packages/cairo/libsvg-cairo_0.1.6.bb +++ b/packages/cairo/libsvg-cairo_0.1.6.bb @@ -9,5 +9,5 @@ SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/cairo/xsvg_cvs.bb b/packages/cairo/xsvg_cvs.bb index 8f4f4bfdc4..210898f576 100644 --- a/packages/cairo/xsvg_cvs.bb +++ b/packages/cairo/xsvg_cvs.bb @@ -14,5 +14,5 @@ BROKEN = "1" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/callweaver/callweaver_1.2.0-rc5.bb b/packages/callweaver/callweaver_1.2.0-rc5.bb index 608181f96c..32869936b6 100644 --- a/packages/callweaver/callweaver_1.2.0-rc5.bb +++ b/packages/callweaver/callweaver_1.2.0-rc5.bb @@ -29,9 +29,9 @@ INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d -EXTRA_OECONF = " --with-ssl=${STAGING_DIR}/${HOST_SYS} --enable-low_memory \ +EXTRA_OECONF = " --with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix} --enable-low_memory \ --disable-zaptel --with-directory-layout=lsb --enable-t38 \ - --with-codec-speex=${STAGING_DIR}/${HOST_SYS} \ + --with-codec-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \ --with-perl-shebang='#!${bindir}/perl' --with-jabber --with-res_jabber \ --with-javascript --with-res_js \ --bindir=${bindir} --datadir=${datadir} --sysconfdir=${sysconfdir} \ diff --git a/packages/dejagnu/dejagnu-qemu_1.0.bb b/packages/dejagnu/dejagnu-qemu_1.0.bb index 7230f985f6..2eef27e9a3 100644 --- a/packages/dejagnu/dejagnu-qemu_1.0.bb +++ b/packages/dejagnu/dejagnu-qemu_1.0.bb @@ -13,7 +13,7 @@ do_stage() { install -m 0644 ${WORKDIR}/arm-qemu.exp ${STAGING_DATADIR}/dejagnu/baseboards/ cat <<EOF >${STAGING_BINDIR_NATIVE}/${QEMU}-test-wrapper #!/bin/sh -exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR}/${TARGET_SYS}/lib \$1 +exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR_TARGET}${layout_libdir} \$1 EOF chmod 755 ${STAGING_BINDIR_NATIVE}/arm-qemu-test-wrapper } diff --git a/packages/dtnrg/dtn_2.5.0.bb b/packages/dtnrg/dtn_2.5.0.bb index 5975a29e7c..3878829ce5 100644 --- a/packages/dtnrg/dtn_2.5.0.bb +++ b/packages/dtnrg/dtn_2.5.0.bb @@ -3,29 +3,30 @@ HOMEPAGE = "http://www.dtnrg.org/wiki" SECTION = "libs" DEPENDS = "db openssl python-native xerces-c" LICENSE = "Apache" -SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz" -PR = "r2" +SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz \ + file://configure_fix.patch;patch=1" +PR = "r3" inherit autotools EXTRA_OECONF = "\ --with-python=${STAGING_BINDIR_NATIVE}/python \ - --with-db=${STAGING_DIR} \ - --with-tcl=${STAGING_DIR} \ + --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-tcl=${STAGING_DIR_HOST}${layout_exec_prefix} \ --without-google-perftools \ --without-bluez \ --without-bonjour \ - --with-expat=${STAGING_DIR} \ - --with-xerces-c=${STAGING_DIR} \ + --with-expat=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-xerces-c=${STAGING_DIR_HOST}${layout_exec_prefix} \ --without-tclreadline \ - --with-zlib=${STAGING_DIR} \ + --with-zlib=${STAGING_DIR_HOST}${layout_exec_prefix} \ --without-xsd-tool \ - --with-db=${STAGING_DIR} \ + --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \ --enable-ecl \ --enable-edp \ --without-mysql \ --without-postgres \ - --with-openssl=${STAGING_DIR} \ + --with-openssl=${STAGING_DIR_HOST}${layout_exec_prefix} \ " def dtn_python_dir(d): diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index e8f263d1a9..4a406d6516 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -26,7 +26,7 @@ FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \ FILES_${PN} += "${datadir}/emacs" -QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${TARGET_SYS}" +QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR_TARGET}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" EXTRA_OECONF = "--without-sound --without-x" diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb index ddd7acef82..548a824523 100644 --- a/packages/enca/enca_1.9.bb +++ b/packages/enca/enca_1.9.bb @@ -13,7 +13,7 @@ SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV} inherit autotools -EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR}" +EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" do_configure_append() { sed -i s:-I/usr/include::g Makefile diff --git a/packages/erlang/erlang_R11B.1.bb b/packages/erlang/erlang_R11B.1.bb index 4c754f6c3e..e85a297ff9 100644 --- a/packages/erlang/erlang_R11B.1.bb +++ b/packages/erlang/erlang_R11B.1.bb @@ -11,7 +11,7 @@ SRC_URI += "file://erts-configure.in.patch;patch=1 \ EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'" -EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${HOST_SYS}" +EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix}" EXTRA_OECONF_append_arm = " --disable-smp-support --disable-hipe" EXTRA_OECONF_append_armeb = " --disable-smp-support --disable-hipe" diff --git a/packages/fltk/efltk_2.0.7.bb b/packages/fltk/efltk_2.0.7.bb index 57737e1c57..b048e078b3 100644 --- a/packages/fltk/efltk_2.0.7.bb +++ b/packages/fltk/efltk_2.0.7.bb @@ -40,11 +40,7 @@ do_configure_append() { } do_stage() { - oe_runmake install prefix="${STAGING_DIR}" \ - bindir="${STAGING_BINDIR}" \ - includedir="${STAGING_INCDIR}" \ - libdir="${STAGING_LIBDIR}" \ - datadir="${STAGING_DATADIR}" + autotools_stage_all } do_install () { diff --git a/packages/fltk/fltk_1.1.4.bb b/packages/fltk/fltk_1.1.4.bb index 66c4b214ec..ae7c0e1c95 100644 --- a/packages/fltk/fltk_1.1.4.bb +++ b/packages/fltk/fltk_1.1.4.bb @@ -21,11 +21,7 @@ do_configure() { } do_install () { - oe_runmake prefix="${D}${prefix}" \ - bindir="${D}${bindir}" \ - libdir="${D}${libdir}" \ - includedir="${D}${includedir}" \ - install + autotools_stage_all } do_stage() { diff --git a/packages/fltk/fltk_1.1.7.bb b/packages/fltk/fltk_1.1.7.bb index 3e095b45a3..866db129e8 100644 --- a/packages/fltk/fltk_1.1.7.bb +++ b/packages/fltk/fltk_1.1.7.bb @@ -19,11 +19,7 @@ do_configure() { } do_stage() { - oe_runmake install prefix="${STAGING_DIR}" \ - bindir="${STAGING_BINDIR}" \ - includedir="${STAGING_INCDIR}" \ - libdir="${STAGING_LIBDIR}" \ - datadir="${STAGING_DATADIR}" + autotools_stage_all } do_install () { diff --git a/packages/fs/fs_cvs.bb b/packages/fs/fs_cvs.bb index 8e2724ce4b..b1d6ed4bea 100644 --- a/packages/fs/fs_cvs.bb +++ b/packages/fs/fs_cvs.bb @@ -10,9 +10,5 @@ S = "${WORKDIR}/FS" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb index 06cbbb23e4..1cfd085b27 100644 --- a/packages/gcc/gcc_4.2.2.bb +++ b/packages/gcc/gcc_4.2.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -PR = "r4" +PR = "r5" inherit autotools gettext diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb index 5ce1c0b58c..631c2d7933 100644 --- a/packages/gpephone/linphone_1.5.0.bb +++ b/packages/gpephone/linphone_1.5.0.bb @@ -15,8 +15,8 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \ --without-sdl --disable-video --enable-alsa \ - --with-osip=${STAGING_DIR}/${HOST_SYS} \ - --with-readline=${STAGING_DIR}/${HOST_SYS} \ + --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \ --disable-truespeech --disable-manual \ --disable-glibtest --disable-glib --disable-strict" diff --git a/packages/gpgme/gpgme.inc b/packages/gpgme/gpgme.inc index dc8df2c85f..71cd68fa2b 100644 --- a/packages/gpgme/gpgme.inc +++ b/packages/gpgme/gpgme.inc @@ -5,7 +5,7 @@ DEPENDS = "libgpg-error pth libassuan" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz" -EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm" +EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST}${layout_exec_prefix} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm" LEAD_SONAME = "libgpgme.so" diff --git a/packages/gtk+/gdk-pixbuf_2.10.14.bb b/packages/gtk+/gdk-pixbuf_2.10.14.bb index ecd2d51d49..7d3e7dc92a 100644 --- a/packages/gtk+/gdk-pixbuf_2.10.14.bb +++ b/packages/gtk+/gdk-pixbuf_2.10.14.bb @@ -73,7 +73,7 @@ do_compile() { do_stage() { oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR} - cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr + cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR_HOST}${layout_exec_prefix} autotools_stage_includes # install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include # install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h diff --git a/packages/gtk+/gtk+-directfb_2.10.14.bb b/packages/gtk+/gtk+-directfb_2.10.14.bb index e77f24638d..6fcaf299dc 100644 --- a/packages/gtk+/gtk+-directfb_2.10.14.bb +++ b/packages/gtk+/gtk+-directfb_2.10.14.bb @@ -44,7 +44,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ # file://gtk-doc.patch;patch=1 \ " EXTRA_OECONF =" \ - --prefix=${STAGING_DIR} \ + --prefix=${STAGING_DIR_HOST}${layout_prefix} \ --with-gdktarget=directfb \ --without-x \ --without-libtiff \ diff --git a/packages/gxine/gxine_0.4.1.bb b/packages/gxine/gxine_0.4.1.bb index 057b8a48eb..9648e9ef0c 100644 --- a/packages/gxine/gxine_0.4.1.bb +++ b/packages/gxine/gxine_0.4.1.bb @@ -36,7 +36,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-${PV}.tar.gz \ EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \ --libdir=${STAGING_LIBDIR} \ --disable-xinetest \ - --with-xine-prefix=${STAGING_DIR}/${HOST_SYS}" + --with-xine-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" LDFLAGS += "-lxine" diff --git a/packages/gxine/gxine_0.4.1enhanced.bb b/packages/gxine/gxine_0.4.1enhanced.bb index 7245d1de13..96776645ab 100644 --- a/packages/gxine/gxine_0.4.1enhanced.bb +++ b/packages/gxine/gxine_0.4.1enhanced.bb @@ -39,7 +39,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-0.4.1.tar.gz \ EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \ --libdir=${STAGING_LIBDIR} \ --disable-xinetest \ - --with-xine-prefix=${STAGING_DIR}/${HOST_SYS}" + --with-xine-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" LDFLAGS += "-lxine" diff --git a/packages/iperf/iperf_2.0.2.bb b/packages/iperf/iperf_2.0.2.bb index c54bafe70d..28d009ad58 100644 --- a/packages/iperf/iperf_2.0.2.bb +++ b/packages/iperf/iperf_2.0.2.bb @@ -14,7 +14,7 @@ S="${WORKDIR}/iperf-${PV}" # --disable-threads is needed on epia/x86 with uclibc do_configure() { gnu-configize - oe_runconf --exec-prefix=${STAGING_DIR} --disable-threads + oe_runconf --exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix} --disable-threads } do_compile() { diff --git a/packages/klibc/klibc-common.inc b/packages/klibc/klibc-common.inc index 76e393796a..7b23ece856 100644 --- a/packages/klibc/klibc-common.inc +++ b/packages/klibc/klibc-common.inc @@ -4,7 +4,9 @@ DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \ use with initramfs. It is deliberately written for small size, \ minimal entaglement, and portability, not speed." LICENSE = "BSD-ADV" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2 \ + file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \ + " S = "${WORKDIR}/klibc-${PV}" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -16,8 +18,10 @@ KLIBC_ARCH_mipsel = 'mips' # could be fixed, but for the moment: ARM_INSTRUCTION_SET = "arm" -SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1" -SRC_URI_append_linux-uclibcgnueabi = "file://klibc-config-eabi.patch;patch=1" +SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1 \ + " +SRC_URI_append_linux-uclibcgnueabi = "file://klibc-config-eabi.patch;patch=1 \ + " EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ 'CROSS_COMPILE=${TARGET_PREFIX}' \ diff --git a/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb index f9c9923212..6d7a199967 100644 --- a/packages/klibc/klibc-utils-static_1.5.bb +++ b/packages/klibc/klibc-utils-static_1.5.bb @@ -1,7 +1,6 @@ require klibc-common.inc -PR = "r6" - +PR = "r7" # We only want the static utils. klibc build both. So we install only what we want. do_install() { diff --git a/packages/klibc/klibc_1.5.bb b/packages/klibc/klibc_1.5.bb index 71eed9f8da..b5bd3557cf 100644 --- a/packages/klibc/klibc_1.5.bb +++ b/packages/klibc/klibc_1.5.bb @@ -1,2 +1,2 @@ require klibc.inc -PR = "r4" +PR = "r5" diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb index 9acfc71204..a84f47d471 100644 --- a/packages/konqueror/konqueror-embedded_20060404.bb +++ b/packages/konqueror/konqueror-embedded_20060404.bb @@ -35,9 +35,9 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \ --with-extra-includes=${STAGING_INCDIR} \ --with-extra-libs=${STAGING_LIBDIR} \ --with-ssl-version=0.9.7e \ - --with-ssl-dir=${STAGING_LIBDIR}/.. \ - --with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \ - --with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \ + --with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-qt-includes=${STAGING_DIR_HOST}/qt2/include \ + --with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \ --enable-fontsubs \ --with-konq-tmp-prefix=/tmp/kde-cache \ # --enable-static \ diff --git a/packages/konqueror/konqueror-embedded_20070212.bb b/packages/konqueror/konqueror-embedded_20070212.bb index 02e411e9f7..3fb8a5cfa6 100644 --- a/packages/konqueror/konqueror-embedded_20070212.bb +++ b/packages/konqueror/konqueror-embedded_20070212.bb @@ -36,9 +36,9 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \ --with-extra-libs=${STAGING_LIBDIR} \ --with-qtopia-dir=${OPIEDIR} \ --with-ssl-version=0.9.7e \ - --with-ssl-dir=${STAGING_LIBDIR}/.. \ - --with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \ - --with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \ + --with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-qt-includes=${STAGING_DIR_HOST}/qt2/include \ + --with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \ --with-qt-dir=${QTDIR} \ --enable-fontsubs \ --with-konq-tmp-prefix=/tmp/kde-cache \ diff --git a/packages/libaio/libaio_0.3.103.bb b/packages/libaio/libaio_0.3.103.bb index b0bc73617e..1453599855 100644 --- a/packages/libaio/libaio_0.3.103.bb +++ b/packages/libaio/libaio_0.3.103.bb @@ -26,8 +26,8 @@ do_unpack() { } do_stage () { - #make install prefix='${STAGING_DIR}/${TARGET_SYS}' - install -D -m 644 src/libaio.h ${STAGING_DIR}/${TARGET_SYS}/include/libaio.h + #make install prefix='${STAGING_DIR_TARGET}${layout_prefix}' + install -D -m 644 src/libaio.h ${STAGING_INCDIR}/libaio.h oe_libinstall -so -C src libaio ${STAGING_LIBDIR} } diff --git a/packages/libidl/libidl_0.8.2.bb b/packages/libidl/libidl_0.8.2.bb index 85114d6524..8a5b683d1e 100644 --- a/packages/libidl/libidl_0.8.2.bb +++ b/packages/libidl/libidl_0.8.2.bb @@ -6,5 +6,5 @@ S = "${WORKDIR}/libIDL-${PV}" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb index 7a5a0d454e..5f788a91d8 100644 --- a/packages/libidl/libidl_0.8.3.bb +++ b/packages/libidl/libidl_0.8.3.bb @@ -13,13 +13,7 @@ inherit autotools pkgconfig # strange reason - so we do some sed fu to fix the path there do_stage() { - oe_runmake install \ - prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - infodir=${STAGING_INFODIR} + autotools_stage_all cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2 diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb index 33a1154357..2f44147711 100644 --- a/packages/libidl/libidl_0.8.6.bb +++ b/packages/libidl/libidl_0.8.6.bb @@ -10,9 +10,6 @@ S = "${WORKDIR}/libIDL-${PV}" BINCONFIG_GLOB = "*-config-2" inherit autotools pkgconfig binconfig -# Firefox uses the libIDL-config-2 script instead of pkgconfig (for some -# strange reason - so we do some sed fu to fix the path there - do_stage() { autotools_stage_all } diff --git a/packages/libxslt/libxslt_1.1.17.bb b/packages/libxslt/libxslt_1.1.17.bb index 2ae61eeaf5..d4fadc401b 100644 --- a/packages/libxslt/libxslt_1.1.17.bb +++ b/packages/libxslt/libxslt_1.1.17.bb @@ -32,8 +32,8 @@ do_stage () { install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i done - cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \ - -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \ + cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR_HOST}${layout_prefix}," \ + -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}," \ -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \ -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config diff --git a/packages/linphone/linphone_1.3.99.8.bb b/packages/linphone/linphone_1.3.99.8.bb index 05998f889d..f96bd66b82 100644 --- a/packages/linphone/linphone_1.3.99.8.bb +++ b/packages/linphone/linphone_1.3.99.8.bb @@ -15,9 +15,9 @@ inherit autotools EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \ --without-sdl --disable-video --enable-alsa \ - --with-osip=${STAGING_DIR}/${HOST_SYS} \ - --with-readline=${STAGING_DIR}/${HOST_SYS} \ - --with-speex=${STAGING_DIR}/${HOST_SYS} \ + --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \ --disable-truespeech --disable-manual \ --disable-glibtest --disable-glib" diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb index 7a90cdd5c9..fe40b6a270 100644 --- a/packages/linphone/linphone_1.6.0.bb +++ b/packages/linphone/linphone_1.6.0.bb @@ -32,9 +32,9 @@ export PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config EXTRA_OECONF = "--disable-gtk-doc \ --without-ffmpeg --disable-video --without-sdl \ --enable-alsa \ - --with-osip=${STAGING_DIR}/${HOST_SYS} \ - --with-readline=${STAGING_DIR}/${HOST_SYS} \ - --with-speex=${STAGING_DIR}/${HOST_SYS} \ + --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \ --disable-truespeech --disable-manual \ --disable-gnome_ui" diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb index e679e25b8d..19a0d43e33 100644 --- a/packages/ltrace/ltrace_0.4.bb +++ b/packages/ltrace/ltrace_0.4.bb @@ -17,7 +17,7 @@ EXTRA_OEMAKE = "INSTALL_FILE='$(INSTALL) -p -m 0644' \ INSTALL_SCRIPT='$(INSTALL) -p -m 0755' \ INSTALL_DIR='$(INSTALL) -p -d -m 0755' " -export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include" +export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_INCDIR}" do_configure_prepend() { ln -sf ./linux-gnu sysdeps/linux-gnueabi diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb index cc40205c50..71fcad27cf 100644 --- a/packages/maemo/xpext_1.0-5.bb +++ b/packages/maemo/xpext_1.0-5.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" LICENSE= "MIT" DESCRIPTION = "X Server Nokia 770 extensions library" SECTION = "x11/libs" @@ -18,10 +18,5 @@ do_configure_prepend () { } do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DATADIR}/man + autotools_stage_all } diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb index d5f94c64cd..f4f872e57f 100644 --- a/packages/maemo/xsp_1.0.0-8.bb +++ b/packages/maemo/xsp_1.0.0-8.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" LICENSE= "MIT" DESCRIPTION = "X Server Nokia 770 extensions library" SECTION = "x11/libs" @@ -11,10 +11,5 @@ S = "${WORKDIR}/Xsp" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DATADIR}/man + autotools_stage_all } diff --git a/packages/mono/mono-mcs-intermediate.inc b/packages/mono/mono-mcs-intermediate.inc index db74b96ee3..f6631c1eb1 100644 --- a/packages/mono/mono-mcs-intermediate.inc +++ b/packages/mono/mono-mcs-intermediate.inc @@ -47,8 +47,8 @@ do_populate_staging() { cd ${D} rm -f ${WORKDIR}/mono-mcs-${PV}.tar.gz tar -cvzf ${WORKDIR}/mono-mcs-${PV}.tar.gz . - install -d ${STAGING_DIR}/share/mono-mcs - cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DIR}/share/mono-mcs/ + install -d ${STAGING_DATADIR}/mono-mcs + cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DATADIR}/mono-mcs/ } do_package_write_ipk() { diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb index 1d58c2d810..a9bf2f8e1e 100644 --- a/packages/mono/mono_1.2.5.1.bb +++ b/packages/mono/mono_1.2.5.1.bb @@ -14,7 +14,7 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} pushd ${D} - tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz popd } diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb index 5c5d8476bb..a5359125a9 100644 --- a/packages/mono/mono_1.2.6.bb +++ b/packages/mono/mono_1.2.6.bb @@ -13,7 +13,7 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} pushd ${D} - tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz popd } diff --git a/packages/mono/mono_svn.bb b/packages/mono/mono_svn.bb index 6644efb4e3..53d0fb0d30 100644 --- a/packages/mono/mono_svn.bb +++ b/packages/mono/mono_svn.bb @@ -14,7 +14,7 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} pushd ${D} - tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz popd } diff --git a/packages/motion/motion_3.2.9.bb b/packages/motion/motion_3.2.9.bb index 1010e7f046..f5f5b62708 100644 --- a/packages/motion/motion_3.2.9.bb +++ b/packages/motion/motion_3.2.9.bb @@ -16,4 +16,4 @@ inherit autotools EXTRA_OECONF = " --with-ffmpeg=${STAGING_LIBDIR} \ --with-mysql-lib=${STAGING_LIBDIR} \ --with-mysql-include=${STAGING_INCDIR}/mysql \ - --with-pgsql=${STAGING_DIR} " + --with-pgsql=${STAGING_DIR_HOST}${layout_exec_prefix} " diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb index a42498cfd4..1a60ab17a2 100644 --- a/packages/mpfr/mpfr_2.1.1.bb +++ b/packages/mpfr/mpfr_2.1.1.bb @@ -7,10 +7,5 @@ SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2" S = "${WORKDIR}/mpfr-${PV}" do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - infodir=${STAGING_DIR}/${HOST_SYS}/info + autotools_stage_all } diff --git a/packages/mpfr/mpfr_2.3.0.bb b/packages/mpfr/mpfr_2.3.0.bb index 92fbe7bd4b..869c4227e2 100644 --- a/packages/mpfr/mpfr_2.3.0.bb +++ b/packages/mpfr/mpfr_2.3.0.bb @@ -7,9 +7,5 @@ SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2" S = "${WORKDIR}/mpfr-${PV}" do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/packages/mpfr/mpfr_svn.bb b/packages/mpfr/mpfr_svn.bb index da6036e69f..f1e9273a65 100644 --- a/packages/mpfr/mpfr_svn.bb +++ b/packages/mpfr/mpfr_svn.bb @@ -8,9 +8,5 @@ SRC_URI = "svn://scm.gforge.inria.fr/svn/mpfr;module=trunk" S = "${WORKDIR}/trunk" do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/packages/netatalk/netatalk_2.0.3.bb b/packages/netatalk/netatalk_2.0.3.bb index 5fd7255fed..4f802dbcf6 100644 --- a/packages/netatalk/netatalk_2.0.3.bb +++ b/packages/netatalk/netatalk_2.0.3.bb @@ -17,13 +17,13 @@ inherit autotools update-rc.d do_configure () { autoreconf - ac_cv_header_rpcsvc_rquota_h=no LDFLAGS="-lpthread -L${STAGING_DIR}/${TARGET_SYS}/lib" ./configure \ + ac_cv_header_rpcsvc_rquota_h=no LDFLAGS="-lpthread -L${STAGING_LIBDIR}" ./configure \ --build=${BUILD_SYS} \ --host=${HOST_SYS} \ --target=${TARGET_SYS} \ --prefix=${prefix} \ - --with-bdb=${STAGING_DIR}/${TARGET_SYS} \ - --with-ssl-dir=${STAGING_DIR}/${TARGET_SYS} \ + --with-bdb=${STAGING_DIR_TARGET}${layout_exec_prefix} \ + --with-ssl-dir=${STAGING_DIR_TARGET}${layout_exec_prefix} \ --without-shadow \ --sysconfdir=${sysconfdir} \ --disable-nls \ diff --git a/packages/pax-utils/pax-utils-native_0.1.13.bb b/packages/pax-utils/pax-utils-native_0.1.13.bb index 52f5d59515..5a56c01aa4 100644 --- a/packages/pax-utils/pax-utils-native_0.1.13.bb +++ b/packages/pax-utils/pax-utils-native_0.1.13.bb @@ -3,7 +3,7 @@ inherit native require pax-utils_${PV}.bb do_stage() { - oe_runmake PREFIX=${STAGING_DIR}/${HOST_SYS} install + oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install } do_install() { diff --git a/packages/php/php_5.2.0.bb b/packages/php/php_5.2.0.bb index 4ed88cf411..890d467c10 100644 --- a/packages/php/php_5.2.0.bb +++ b/packages/php/php_5.2.0.bb @@ -15,7 +15,7 @@ EXTRA_OECONF = " --without-iconv \ --enable-embedded-mysqli \ --enable-magic-quotes \ --with-zlib \ - --with-mysql="${STAGING_DIR}/${TARGET_SYS}" \ + --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \ " diff --git a/packages/pwc/pwc_10.0.12-rc1.bb b/packages/pwc/pwc_10.0.12-rc1.bb index 626a8ef47a..af1d5f53ab 100644 --- a/packages/pwc/pwc_10.0.12-rc1.bb +++ b/packages/pwc/pwc_10.0.12-rc1.bb @@ -23,8 +23,8 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib" +export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ + -rpath-link ${STAGING_DIR_TARGET}${layout_libdir}" do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/python/python-sword_1.5.10.bb b/packages/python/python-sword_1.5.10.bb index a18cf89466..4769a8814f 100644 --- a/packages/python/python-sword_1.5.10.bb +++ b/packages/python/python-sword_1.5.10.bb @@ -11,7 +11,7 @@ SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar. S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package" -EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}" +EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR_HOST}${layout_exec_prefix}" inherit distutils autotools diff --git a/packages/radlib/radlib-mysql.inc b/packages/radlib/radlib-mysql.inc index a6a5923343..12cb73dcea 100644 --- a/packages/radlib/radlib-mysql.inc +++ b/packages/radlib/radlib-mysql.inc @@ -2,5 +2,5 @@ DEPENDS = "mysql" export CFLAGS_append=" -I${STAGING_INCDIR}/mysql " -EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR} --enable-mysql" +EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR_HOST}${layout_prefix} --enable-mysql" diff --git a/packages/radlib/radlib.inc b/packages/radlib/radlib.inc index 67357ebe55..b8fa555771 100644 --- a/packages/radlib/radlib.inc +++ b/packages/radlib/radlib.inc @@ -1 +1 @@ -EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR}" +EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR_HOST}${layout_prefix}" diff --git a/packages/roadster/roadster_cvs.bb b/packages/roadster/roadster_cvs.bb index ae32f204a2..81e406c6e1 100644 --- a/packages/roadster/roadster_cvs.bb +++ b/packages/roadster/roadster_cvs.bb @@ -11,7 +11,7 @@ RDEPENDS = "gpsd gtk+ cairo libxml2" SRC_URI = "cvs://anoncvs@cvs.cairographics.org/cvs/cairo;module=roadster" S = "${WORKDIR}/${PN}" -EXTRA_OECONF = " --with-gpsd=${STAGING_DIR}/${TARGET_SYS} " +EXTRA_OECONF = " --with-gpsd=${STAGING_DIR_TARGET}${layout_exec_prefix} " inherit autotools CFLAGS += " -I{$STAGING_INCDIR} " diff --git a/packages/skippy/skippy-xd_0.5.0.bb b/packages/skippy/skippy-xd_0.5.0.bb index a27670da76..c5ed177aa6 100644 --- a/packages/skippy/skippy-xd_0.5.0.bb +++ b/packages/skippy/skippy-xd_0.5.0.bb @@ -9,9 +9,9 @@ SRC_URI = "http://thegraveyard.org/files/${PN}-${PV}.tar.bz2 \ file://fix-makefile.patch;patch=1 \ file://event_base.patch;patch=1" -EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR}/${TARGET_SYS}' PKG_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config'" -CFLAGS_append = " -I${STAGING_DIR}/${TARGET_SYS}/include/X11" -LDFLAGS_append = " -L${STAGING_DIR}/${TARGET_SYS}/lib/X11" +EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR_TARGET}${layout_prefix}' PKG_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config'" +CFLAGS_append = " -I${STAGING_INCDIR}/X11" +LDFLAGS_append = " -L${STAGING_LIBDIR}/X11" do_install() { oe_runmake 'BINDIR=${D}${bindir}' install diff --git a/packages/sox/sox-native_13.0.0.bb b/packages/sox/sox-native_13.0.0.bb index 9b4dd29433..9be032260c 100644 --- a/packages/sox/sox-native_13.0.0.bb +++ b/packages/sox/sox-native_13.0.0.bb @@ -9,7 +9,7 @@ do_patch() { } do_stage() { - make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR}/${HOST_SYS}/man" includedir="${STAGING_INCDIR}" install + make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR_HOST}${layout_mandir}" includedir="${STAGING_INCDIR}" install rm ${STAGING_BINDIR}/rec ln -s ${STAGING_BINDIR}/play ${STAGING_BINDIR}/rec } |