mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

Remove hardcoded staging layout assumptions

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3116 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-11-12 11:06:34 +00:00
parent 19f1bad378
commit 0e09147de1
18 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/claws-mail/claws-mail.inc
+1 -1
View File
@@ -15,7 +15,7 @@ SRC_URI = "\
FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
#EXTRA_OECONF = "--disable-aspell-test \ #EXTRA_OECONF = "--disable-aspell-test \
# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR}/${HOST_SYS} \ # --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} \
# --enable-aspell" # --enable-aspell"
EXTRA_OECONF = "--disable-aspell-test \ EXTRA_OECONF = "--disable-aspell-test \
meta/packages/curl/curl_7.16.2.bb
+1 -1
View File
@@ -10,7 +10,7 @@ S = "${WORKDIR}/curl-${PV}"
inherit autotools pkgconfig binconfig inherit autotools pkgconfig binconfig
EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ EXTRA_OECONF = "--with-zlib=${STAGING_DIR_HOST}${layout_prefix}/ \
--without-ssl \ --without-ssl \
--with-random=/dev/urandom \ --with-random=/dev/urandom \
--without-idn \ --without-idn \
meta/packages/eds/eds-dbus_svn.bb
+1 -1
View File
@@ -21,7 +21,7 @@ inherit autotools pkgconfig
LDFLAGS += "-lpthread" LDFLAGS += "-lpthread"
do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} " do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} "
EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR}/${HOST_SYS} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev libedata-book libedata-book-dev libedata-cal libedata-cal-dev libedataserver libedataserver-dev" PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev libedata-book libedata-book-dev libedata-cal libedata-cal-dev libedataserver libedataserver-dev"
meta/packages/gcc/gcc-cross-initial.inc
+1 -1
View File
@@ -4,7 +4,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
PACKAGES = "" PACKAGES = ""
# This is intended to be a -very- basic config # This is intended to be a -very- basic config
EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
--with-newlib \ --with-newlib \
--disable-shared \ --disable-shared \
--disable-threads \ --disable-threads \
meta/packages/gcc/gcc4-build-sdk.inc
+2 -2
View File
@@ -7,8 +7,8 @@ EXTRA_OECONF += "--with-sysroot=${SYSROOT}"
do_configure () { do_configure () {
# Work around Hardcoded path assumptions in gcc # Work around Hardcoded path assumptions in gcc
mkdir -p ${SYSROOT}/usr/ mkdir -p ${SYSROOT}/usr/
ln -s ${STAGING_DIR}/${TARGET_SYS}/include ${SYSROOT}/usr/include ln -s ${STAGING_DIR_TARGET}${layout_includedir} ${SYSROOT}/usr/include
ln -s ${STAGING_DIR}/${TARGET_SYS}/lib ${SYSROOT}/usr/lib ln -s ${STAGING_DIR_TARGET}${layout_libdir} ${SYSROOT}/usr/lib
(cd ${S} && gnu-configize) || die "failure running gnu-configize" (cd ${S} && gnu-configize) || die "failure running gnu-configize"
(cd ${S}/libstdc++-v3 && autoreconf) (cd ${S}/libstdc++-v3 && autoreconf)
oe_runconf oe_runconf
meta/packages/gstreamer/gstreamer_0.10.14.bb
+2 -2
View File
@@ -20,12 +20,12 @@ EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=
#} #}
do_stage() { do_stage() {
oe_runmake install prefix=${STAGING_DIR} \ oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
bindir=${STAGING_BINDIR} \ bindir=${STAGING_BINDIR} \
includedir=${STAGING_INCDIR} \ includedir=${STAGING_INCDIR} \
libdir=${STAGING_LIBDIR} \ libdir=${STAGING_LIBDIR} \
datadir=${STAGING_DATADIR} \ datadir=${STAGING_DATADIR} \
mandir=${STAGING_DIR}/share/man mandir=${STAGING_DIR_HOST}${layout_mandir}
} }
FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
meta/packages/hal/hal_0.5.9.1.bb
+1 -1
View File
@@ -19,7 +19,7 @@ S = "${WORKDIR}/hal-${PV}"
inherit autotools pkgconfig inherit autotools pkgconfig
EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
--with-expat=${STAGING_LIBDIR}/.. \ --with-expat=${STAGING_DIR_HOST}${layout_prefix} \
--with-dbus-sys=${sysconfdir}/dbus-1/system.d \ --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
--with-hotplug=${sysconfdir}/hotplug.d \ --with-hotplug=${sysconfdir}/hotplug.d \
--disable-docbook-docs \ --disable-docbook-docs \
meta/packages/hal/hal_git.bb
+1 -1
View File
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
inherit autotools pkgconfig inherit autotools pkgconfig
EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
--with-expat=${STAGING_LIBDIR}/.. \ --with-expat=${STAGING_DIR_HOST}${layout_prefix} \
--with-dbus-sys=${sysconfdir}/dbus-1/system.d \ --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
--with-hotplug=${sysconfdir}/hotplug.d \ --with-hotplug=${sysconfdir}/hotplug.d \
--disable-docbook-docs \ --disable-docbook-docs \
meta/packages/libidl/libidl_0.8.3.bb
+1 -1
View File
@@ -15,7 +15,7 @@ inherit autotools pkgconfig binconfig
do_stage() { do_stage() {
oe_runmake install \ oe_runmake install \
prefix=${STAGING_DIR} \ prefix=${STAGING_DIR_HOST}${layout_prefix} \
bindir=${STAGING_BINDIR} \ bindir=${STAGING_BINDIR} \
includedir=${STAGING_INCDIR} \ includedir=${STAGING_INCDIR} \
libdir=${STAGING_LIBDIR} \ libdir=${STAGING_LIBDIR} \
meta/packages/libxslt/libxslt_1.1.20.bb
+2 -2
View File
@@ -30,8 +30,8 @@ do_stage () {
install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
done done
cat xslt-config | sed -e "s,^prefix=.*,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_SYS}," \ -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}," \
-e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \ -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config
meta/packages/maemo/xpext_1.0-5.bb
+2 -2
View File
@@ -18,10 +18,10 @@ do_configure_prepend () {
} }
do_stage() { do_stage() {
oe_runmake install prefix=${STAGING_DIR} \ oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
bindir=${STAGING_BINDIR} \ bindir=${STAGING_BINDIR} \
includedir=${STAGING_INCDIR} \ includedir=${STAGING_INCDIR} \
libdir=${STAGING_LIBDIR} \ libdir=${STAGING_LIBDIR} \
datadir=${STAGING_DATADIR} \ datadir=${STAGING_DATADIR} \
mandir=${STAGING_DATADIR}/man mandir=${STAGING_DIR_HOST}${layout_mandir}
} }
meta/packages/maemo/xsp_1.0.0-8.bb
+2 -2
View File
@@ -11,10 +11,10 @@ S = "${WORKDIR}/Xsp"
inherit autotools pkgconfig inherit autotools pkgconfig
do_stage() { do_stage() {
oe_runmake install prefix=${STAGING_DIR} \ oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
bindir=${STAGING_BINDIR} \ bindir=${STAGING_BINDIR} \
includedir=${STAGING_INCDIR} \ includedir=${STAGING_INCDIR} \
libdir=${STAGING_LIBDIR} \ libdir=${STAGING_LIBDIR} \
datadir=${STAGING_DATADIR} \ datadir=${STAGING_DATADIR} \
mandir=${STAGING_DATADIR}/man mandir=${STAGING_DIR_HOST}${layout_mandir}
} }
meta/packages/meta/external-poky-toolchain.bb
+2 -2
View File
@@ -28,11 +28,11 @@ do_stage() {
install -d ${DEPLOY_DIR}/ipk/ install -d ${DEPLOY_DIR}/ipk/
install -d ${STAGING_DIR}/pkgdata/ install -d ${STAGING_DIR}/pkgdata/
install -d ${STAGING_DIR}/pkgmaps/ install -d ${STAGING_DIR}/pkgmaps/
install -d ${STAGING_DIR}/${TARGET_SYS}/shlibs/ install -d ${STAGING_DIR_TARGET}/shlibs/
cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/ cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/
cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
cp -ar ${prefix}/pkgmaps/* ${STAGING_DIR}/pkgmaps/ cp -ar ${prefix}/pkgmaps/* ${STAGING_DIR}/pkgmaps/
cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR}/${TARGET_SYS}/shlibs/ cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
} }
meta/packages/meta/meta-toolchain.bb
+2 -2
View File
@@ -91,8 +91,8 @@ do_populate_sdk() {
if [ -e ${STAGING_DIR}/pkgmaps/debian/$subpkg ]; then if [ -e ${STAGING_DIR}/pkgmaps/debian/$subpkg ]; then
cp ${STAGING_DIR}/pkgmaps/debian/$subpkg ${SDK_OUTPUT}/${prefix}/pkgmaps/debian/ cp ${STAGING_DIR}/pkgmaps/debian/$subpkg ${SDK_OUTPUT}/${prefix}/pkgmaps/debian/
fi fi
if [ -e ${STAGING_DIR}/${TARGET_SYS}/shlibs/$subpkg.list ]; then if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then
cp ${STAGING_DIR}/${TARGET_SYS}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
fi fi
done done
break break
meta/packages/opensync/libopensync_svn.bb
-1
View File
@@ -21,7 +21,6 @@ LEAD_SONAME = "libopensync.so"
FILES_${PN} += " ${libdir}/opensync/formats/*.so ${datadir}/opensync/ ${libdir}/*.so" FILES_${PN} += " ${libdir}/opensync/formats/*.so ${datadir}/opensync/ ${libdir}/*.so"
export HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" export HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
#export PKG_CONFIG_PATH = "${STAGING_DIR}/${TARGET_SYS}/share/pkgconfig"
do_stage() { do_stage() {
install -d ${STAGING_LIBDIR}/formats install -d ${STAGING_LIBDIR}/formats
meta/packages/pax-utils/pax-utils-native_0.1.13.bb
+1 -1
View File
@@ -3,5 +3,5 @@ inherit native
require pax-utils_${PV}.bb require pax-utils_${PV}.bb
do_stage() { do_stage() {
oe_runmake PREFIX=${STAGING_DIR}/${HOST_SYS} install oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install
} }
meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+1 -1
View File
@@ -31,7 +31,7 @@ EXTRA_OECONF = "--enable-menubar --enable-xim \
--enable-text-blink --enable-rxvt-scroll \ --enable-text-blink --enable-rxvt-scroll \
--enable-combining --enable-shared \ --enable-combining --enable-shared \
--enable-xgetdefault \ --enable-xgetdefault \
--with-x=${STAGING_LIBDIR}/.." --with-x=${STAGING_DIR_HOST}${layout_prefix}"
EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \ EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
'XLIB=-L${STAGING_LIBDIR} -lX11'" 'XLIB=-L${STAGING_LIBDIR} -lX11'"
meta/packages/tremor/tremor_20041119.bb
+1 -1
View File
@@ -19,7 +19,7 @@ EXTRA_OECONF=" --enable-shared --disable-rpath "
#} #}
do_stage() { do_stage() {
oe_runmake install prefix=${STAGING_DIR} \ oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
bindir=${STAGING_BINDIR} \ bindir=${STAGING_BINDIR} \
includedir=${STAGING_INCDIR}/tremor \ includedir=${STAGING_INCDIR}/tremor \
libdir=${STAGING_LIBDIR} \ libdir=${STAGING_LIBDIR} \