[oe-commits] org.oe.dev Remove final references to BUILD_SYS in staging paths

rpurdie commit openembedded-commits at lists.openembedded.org
Tue Oct 30 00:38:42 UTC 2007


Remove final references to BUILD_SYS in staging paths

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 1eca501d99b909ff783490fdac2b315cd05f4315
ViewMTN: http://monotone.openembedded.org/revision/info/1eca501d99b909ff783490fdac2b315cd05f4315
Files:
1
classes/bootimg.bbclass
classes/cpan.bbclass
classes/cross.bbclass
classes/mozilla.bbclass
classes/native.bbclass
conf/distro/sharprom-compatible.conf
packages/agg/agg_2.5.bb
packages/frodo/frodo_4.2.bb
packages/gcc/gcc-cross-sdk_4.1.2.bb
packages/gcc/gcc-cross_4.1.0.bb
packages/gcc/gcc-cross_4.1.1.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/klibc/klibc.inc
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-cross_1.5.22.bb
packages/libtool/libtool-cross_1.5.24.bb
packages/modphp/modphp5.inc
packages/prboom/prboom_2.2.6.bb
packages/prboom/prboom_2.3.1.bb
packages/python/python-native_2.5.1.bb
packages/python/python24-native_2.4.0.bb
packages/qemu/qemu-native.inc
packages/qemu/qemu-native_20070613.bb
packages/subversion/subversion_1.3.1.bb
packages/swig/swig_1.3.31.bb
packages/uicmoc/uicmoc4-native.inc
packages/uicmoc/uicmoc4-native_4.3.0.bb
Diffs:

#
# mt diff -rb59bd63bd1a386dbfa1d63857474f905d0465839 -r1eca501d99b909ff783490fdac2b315cd05f4315
#
# 
# 
# patch "classes/bootimg.bbclass"
#  from [98051629daa27a049689f03008b114ce7644361a]
#    to [544e1bd8298e4b8bfd4f4bdbcda498e13fd198d6]
# 
# patch "classes/cpan.bbclass"
#  from [cd258e21fdaede306e71cf91fa3a8052ca827961]
#    to [3d10b2c778e3f89f5026df7ac1fcd54bc43fd360]
# 
# patch "classes/cross.bbclass"
#  from [c0fd2d21a749ceca1bef334641e20b66e044c5b4]
#    to [3a4bcbb22dfee161783616c57a9668a76776f63c]
# 
# patch "classes/mozilla.bbclass"
#  from [5b47ee2741cd6d2bb50add77912917f4e65be96a]
#    to [31a97114fb000d9036266b9dcdcc85790ae09d2f]
# 
# patch "classes/native.bbclass"
#  from [4402d1860cf1901a5e621873b6807574df9906e4]
#    to [2fa46cce43d3c753145a63a3deae182b2c88ed8a]
# 
# patch "conf/distro/sharprom-compatible.conf"
#  from [3c1abcc8cdbeb6500fc7e48ad25b8eb278dff3a1]
#    to [dddff62a6004aa3bd797558e337f219b7a2ec7af]
# 
# patch "packages/agg/agg_2.5.bb"
#  from [b4ff6ac556b341c1668d3b8d54aeb8ac7c3a11c1]
#    to [25669ef6992a1c68599c168e177d6280dbafe5ae]
# 
# patch "packages/frodo/frodo_4.2.bb"
#  from [cb053a0c0ef0f03f4214d108412bab4e6febf9cb]
#    to [d14cc7d19c86d9c53c3ec432450c36b3195b2ccb]
# 
# patch "packages/gcc/gcc-cross-sdk_4.1.2.bb"
#  from [a1f2534a402624014080a47493957b86dbad29eb]
#    to [a242107a56b03242a022e20b178173f22bc0725b]
# 
# patch "packages/gcc/gcc-cross_4.1.0.bb"
#  from [099b2568db31143bc09fe6061097850fb9ccab30]
#    to [45388d846b16babd384838804fecc6bca37d6ee2]
# 
# patch "packages/gcc/gcc-cross_4.1.1.bb"
#  from [f4054ac5d72bab125a84f4297bd60e1aa96db48c]
#    to [32eed7d13d83d5f8969314e6f5619bac79f9da20]
# 
# patch "packages/gcc/gcc-cross_4.1.2.bb"
#  from [1c8dfeb73751415490cee71ede76e79b3e84ddd3]
#    to [a848d98b3c6945c2d1c6945793cd4c470e593886]
# 
# patch "packages/gcc/gcc-cross_4.2.1.bb"
#  from [a97b09211d1289f0d2c70e6c7866141e1d332393]
#    to [4c5116567bdde8af3df8995f4e852f42987248d4]
# 
# patch "packages/gcc/gcc-cross_4.2.2.bb"
#  from [320044acba5e9238f864668a392ad637e62641d5]
#    to [f74cd13c9931a327e5694a1c3ce7fda09afc5511]
# 
# patch "packages/klibc/klibc.inc"
#  from [2619f7a7d823d7bb5fe1870350039f21dea55d9d]
#    to [a0ab0badeee4660b2c4c719d6f5bf971ad4809d5]
# 
# patch "packages/libtool/libtool-cross_1.5.10.bb"
#  from [1d9d18b4a0241cde485f05db92de7f18738d2507]
#    to [ea1ba26d91260c163e077eaf1ce72502cb22d75c]
# 
# patch "packages/libtool/libtool-cross_1.5.22.bb"
#  from [002eaade9d556d7b8b5b6a92240de687b2182477]
#    to [138113c078dbe30ab78a0d2ce0fb2f678723f078]
# 
# patch "packages/libtool/libtool-cross_1.5.24.bb"
#  from [34200c17a03fc06dac7b8aafb40ed9f470813ac1]
#    to [0aab7e15f589c0f61b67b253ce2e2b5105f5c496]
# 
# patch "packages/modphp/modphp5.inc"
#  from [fb79417a25b0d7225ed379425a6f5ba717de2cae]
#    to [a96e5deecb2172e49be52c81488ff463fb1020db]
# 
# patch "packages/prboom/prboom_2.2.6.bb"
#  from [0c4cb9985dbc0f969f512cc154ab992212d88bb8]
#    to [4a496d1c31a04d292d9b770fa02888caf12dd561]
# 
# patch "packages/prboom/prboom_2.3.1.bb"
#  from [b5eb9173dd4dc732bf3e8101665626c8f15c9c0b]
#    to [043f6c3906b0f5b997c5e097baab1e50e69eba2d]
# 
# patch "packages/python/python-native_2.5.1.bb"
#  from [f2b0b3ca647fbd00b50cbdebf99552d902686955]
#    to [392d8ca5c7646d682ea0b9a49f56a2863651ee9d]
# 
# patch "packages/python/python24-native_2.4.0.bb"
#  from [3d6413ce5a1732a0f353b2b23d7da540d6afcff1]
#    to [dca951ae5638fa757dcdb0f45737c779df6c157d]
# 
# patch "packages/qemu/qemu-native.inc"
#  from [22b8987bdaa1e51e0eaff486b9303f0957b086d5]
#    to [ec59f2db532c2f28054275b81071d57e8b0a95a8]
# 
# patch "packages/qemu/qemu-native_20070613.bb"
#  from [750dd1e695e2d0105b93941f87c372ddd4f9f0a1]
#    to [7dab02b3b83dfdaa74a6beee43968886bbdb4850]
# 
# patch "packages/subversion/subversion_1.3.1.bb"
#  from [d95f890ee293a54c28680bc634071286c3dbb808]
#    to [6ff7966e96664ef304c72446fb0683610329c0ab]
# 
# patch "packages/swig/swig_1.3.31.bb"
#  from [e039ec1712b8b85b8b4f05f29abf865f02e7e80a]
#    to [5c5d5324a8d6353470cd4f731afffdc944455025]
# 
# patch "packages/uicmoc/uicmoc4-native.inc"
#  from [e89d594107d11cad2c66dd25e8bd9673cb40f450]
#    to [00e140a2db2c4a7280faaacf41cf19e10afd1b52]
# 
# patch "packages/uicmoc/uicmoc4-native_4.3.0.bb"
#  from [12d984f9a3bcf4b4839856e6082b27e21c3cbcd9]
#    to [e7fa59243f2c32d904b6728883535b5c66696c63]
# 
============================================================
--- classes/bootimg.bbclass	98051629daa27a049689f03008b114ce7644361a
+++ classes/bootimg.bbclass	544e1bd8298e4b8bfd4f4bdbcda498e13fd198d6
@@ -41,7 +41,7 @@ build_boot_bin() {
     		install -m 0644 ${INITRD} ${HDDDIR}/initrd
 	fi
 
-	install -m 444 ${STAGING_DIR}/${BUILD_SYS}/share/syslinux/ldlinux.sys \
+	install -m 444 ${STAGING_DATADIR_NATIVE}/syslinux/ldlinux.sys \
 	${HDDDIR}/ldlinux.sys
 
 	# Do a little math, bash style
@@ -75,7 +75,7 @@ build_boot_bin() {
 		install -m 0644 ${INITRD} ${ISODIR}/initrd
 
 		# And install the syslinux stuff 
-		cp ${STAGING_DIR}/${BUILD_SYS}/share/syslinux/isolinux.bin \
+		cp ${STAGING_DATADIR_NATIVE}/syslinux/isolinux.bin \
 		${ISODIR}
 
 		mkisofs -V ${BOOTIMG_VOLUME_ID} \
============================================================
--- classes/cpan.bbclass	cd258e21fdaede306e71cf91fa3a8052ca827961
+++ classes/cpan.bbclass	3d10b2c778e3f89f5026df7ac1fcd54bc43fd360
@@ -20,14 +20,14 @@ cpan_do_configure () {
 				-e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
 				-e "s:\(INSTALLVENDORLIB = \).*:\1${D}${datadir}/perl5:" \
 				-e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" \
-				-e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \
+				-e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
 				Makefile
 		else
 			sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
 				-e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
 				-e "s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
 				-e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
-				-e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \
+				-e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
 				Makefile
 		fi
 	fi
============================================================
--- classes/cross.bbclass	c0fd2d21a749ceca1bef334641e20b66e044c5b4
+++ classes/cross.bbclass	3a4bcbb22dfee161783616c57a9668a76776f63c
@@ -18,7 +18,7 @@ LDFLAGS = "${BUILD_LDFLAGS}"
 CFLAGS = "${BUILD_CFLAGS}"
 CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
-LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib "
+LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
 
 # Overrides for paths
 
============================================================
--- classes/mozilla.bbclass	5b47ee2741cd6d2bb50add77912917f4e65be96a
+++ classes/mozilla.bbclass	31a97114fb000d9036266b9dcdcc85790ae09d2f
@@ -19,7 +19,7 @@ export HOST_LIBIDL_LIBS = "`${HOST_LIBID
 export CONFIGURE_ARGS = "${EXTRA_OECONF}"
 export HOST_LIBIDL_CFLAGS = "`${HOST_LIBIDL_CONFIG} --cflags`"
 export HOST_LIBIDL_LIBS = "`${HOST_LIBIDL_CONFIG} --libs`"
-export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_DIR}/${BUILD_SYS}/share/pkgconfig pkg-config libIDL-2.0"
+export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_DATADIR_NATIVE}/pkgconfig pkg-config libIDL-2.0"
 export HOST_CC = "${BUILD_CC}"
 export HOST_CXX = "${BUILD_CXX}"
 export HOST_CFLAGS = "${BUILD_CFLAGS}"
@@ -33,8 +33,8 @@ mozilla_do_configure() {
 		set -e
 		for cg in `find ${S} -name config.guess`; do
 			install -m 0755 \
-			${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.guess \
-			${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.sub \
+			${STAGING_DATADIR_NATIVE}/gnu-config/config.guess \
+			${STAGING_DATADIR_NATIVE}/gnu-config/config.sub \
 			`dirname $cg`/
 		done
 	)
============================================================
--- classes/native.bbclass	4402d1860cf1901a5e621873b6807574df9906e4
+++ classes/native.bbclass	2fa46cce43d3c753145a63a3deae182b2c88ed8a
@@ -27,7 +27,7 @@ LDFLAGS = "${BUILD_LDFLAGS}"
 CFLAGS = "${BUILD_CFLAGS}"
 CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
-LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib "
+LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
 
 STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
 STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
============================================================
--- conf/distro/sharprom-compatible.conf	3c1abcc8cdbeb6500fc7e48ad25b8eb278dff3a1
+++ conf/distro/sharprom-compatible.conf	dddff62a6004aa3bd797558e337f219b7a2ec7af
@@ -20,8 +20,8 @@ KERNEL_CONSOLE = "tty1"
 OEINCLUDELOGS = "yes"
 KERNEL_CONSOLE = "tty1"
 # prebuilt toolchain doesn't know about -isystem
-export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+export BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}"
 #DEBUG_OPTIMIZATION = "-O -g3"
 #DEBUG_BUILD = "1"
 
============================================================
--- packages/agg/agg_2.5.bb	b4ff6ac556b341c1668d3b8d54aeb8ac7c3a11c1
+++ packages/agg/agg_2.5.bb	25669ef6992a1c68599c168e177d6280dbafe5ae
@@ -13,7 +13,7 @@ inherit autotools pkgconfig
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OECONF = "--with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 CFLAGS += " -I{$STAGING_INCDIR} "
 
 PACKAGES =+ "${PN}-sdl ${PN}-x11"
============================================================
--- packages/frodo/frodo_4.2.bb	cb053a0c0ef0f03f4214d108412bab4e6febf9cb
+++ packages/frodo/frodo_4.2.bb	d14cc7d19c86d9c53c3ec432450c36b3195b2ccb
@@ -17,7 +17,7 @@ inherit autotools
 
 inherit autotools
 
-EXTRA_OECONF = "--disable-sdltest --enable-qtopia --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OECONF = "--disable-sdltest --enable-qtopia --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 
 do_install() {
         install -d ${D}${palmtopdir}/bin \
============================================================
--- packages/gcc/gcc-cross-sdk_4.1.2.bb	a1f2534a402624014080a47493957b86dbad29eb
+++ packages/gcc/gcc-cross-sdk_4.1.2.bb	a242107a56b03242a022e20b178173f22bc0725b
@@ -10,4 +10,4 @@ require gcc-package-sdk.inc
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
 
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
============================================================
--- packages/gcc/gcc-cross_4.1.0.bb	099b2568db31143bc09fe6061097850fb9ccab30
+++ packages/gcc/gcc-cross_4.1.0.bb	45388d846b16babd384838804fecc6bca37d6ee2
@@ -15,4 +15,4 @@ require gcc-package-cross.inc
 # cross packaging
 require gcc-package-cross.inc
 
+EXTRA_OECONF += "--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
-EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
============================================================
--- packages/gcc/gcc-cross_4.1.1.bb	f4054ac5d72bab125a84f4297bd60e1aa96db48c
+++ packages/gcc/gcc-cross_4.1.1.bb	32eed7d13d83d5f8969314e6f5619bac79f9da20
@@ -17,4 +17,4 @@ SRC_URI_append_fail-fast = " file://zeck
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
============================================================
--- packages/gcc/gcc-cross_4.1.2.bb	1c8dfeb73751415490cee71ede76e79b3e84ddd3
+++ packages/gcc/gcc-cross_4.1.2.bb	a848d98b3c6945c2d1c6945793cd4c470e593886
@@ -17,4 +17,4 @@ SRC_URI_append_fail-fast = " file://zeck
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
============================================================
--- packages/gcc/gcc-cross_4.2.1.bb	a97b09211d1289f0d2c70e6c7866141e1d332393
+++ packages/gcc/gcc-cross_4.2.1.bb	4c5116567bdde8af3df8995f4e852f42987248d4
@@ -17,4 +17,4 @@ SRC_URI_append_fail-fast = " file://zeck
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
============================================================
--- packages/gcc/gcc-cross_4.2.2.bb	320044acba5e9238f864668a392ad637e62641d5
+++ packages/gcc/gcc-cross_4.2.2.bb	f74cd13c9931a327e5694a1c3ce7fda09afc5511
@@ -17,4 +17,4 @@ SRC_URI_append_fail-fast = " file://zeck
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
============================================================
--- packages/klibc/klibc.inc	2619f7a7d823d7bb5fe1870350039f21dea55d9d
+++ packages/klibc/klibc.inc	a0ab0badeee4660b2c4c719d6f5bf971ad4809d5
@@ -60,7 +60,7 @@ do_stage() {
 	rm -rf "${STAGING_KLIBC_DIR}"
 	oe_runmake	'prefix=${STAGING_KLIBC_DIR}' \
 			'bindir=${STAGING_BINDIR}' \
-			'mandir=${STAGING_DATADIR}/man' \
+			'mandir=${STAGING_DIR_HOST}${layout_mandir}' \
 			install
 	# The following is sufficient, at least in klibc 1.1.1 to make klcc
 	# use the staged libraries and include files.
============================================================
--- packages/libtool/libtool-cross_1.5.10.bb	1d9d18b4a0241cde485f05db92de7f18738d2507
+++ packages/libtool/libtool-cross_1.5.10.bb	ea1ba26d91260c163e077eaf1ce72502cb22d75c
@@ -11,8 +11,8 @@ S = "${WORKDIR}/libtool-${PV}"
                    file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${STAGING_DIR}"
-exec_prefix = "${prefix}/${BUILD_SYS}"
+prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
+exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
============================================================
--- packages/libtool/libtool-cross_1.5.22.bb	002eaade9d556d7b8b5b6a92240de687b2182477
+++ packages/libtool/libtool-cross_1.5.22.bb	138113c078dbe30ab78a0d2ce0fb2f678723f078
@@ -14,8 +14,8 @@ S = "${WORKDIR}/libtool-${PV}"
                    file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${STAGING_DIR}"
-exec_prefix = "${prefix}/${BUILD_SYS}"
+prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
+exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
============================================================
--- packages/libtool/libtool-cross_1.5.24.bb	34200c17a03fc06dac7b8aafb40ed9f470813ac1
+++ packages/libtool/libtool-cross_1.5.24.bb	0aab7e15f589c0f61b67b253ce2e2b5105f5c496
@@ -11,8 +11,8 @@ S = "${WORKDIR}/libtool-${PV}"
                    file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${STAGING_DIR}"
-exec_prefix = "${prefix}/${BUILD_SYS}"
+prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
+exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
============================================================
--- packages/modphp/modphp5.inc	fb79417a25b0d7225ed379425a6f5ba717de2cae
+++ packages/modphp/modphp5.inc	a96e5deecb2172e49be52c81488ff463fb1020db
@@ -29,14 +29,14 @@ EXTRA_OECONF = "--with-apxs2=${STAGING_B
 		--disable-simplexml \
 		--disable-libxml \
 		--disable-dom \
-                --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
+                --with-zlib --with-zlib-dir=${STAGING_DIR_NATIVE}${layout_exec_prefix} \
                 --with-config-file-path=/etc/php/apache2-php5"
 
-#		--with-libxml-dir=${STAGING_DIR}/${BUILD_SYS}/ \
+#		--with-libxml-dir=${STAGING_DIR_NATIVE}${layout_exec_prefix} \
 
 # to get postgres support, add it to the DEPENDS above
 # and uncomment this line.  similar for mysql
-#EXTRA_OECONF += " --with-pgsql=${STAGING%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list