[oe-commits] org.oe.dev glibc: Factor staging function into a common .inc and remove hardcoded staging layout

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


glibc: Factor staging function into a common .inc and remove hardcoded staging layout

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 3cfcfc61d18003a57ac218318378e7bd9b72cf15
ViewMTN: http://monotone.openembedded.org/revision/info/3cfcfc61d18003a57ac218318378e7bd9b72cf15
Files:
1
packages/glibc/glibc-stage.inc
packages/glibc/eglibc_svn.bb
packages/glibc/glibc-initial.inc
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_cvs.bb
Diffs:

#
# mt diff -r08654a6de50440cc3e2ff39dc7990ff9202033ea -r3cfcfc61d18003a57ac218318378e7bd9b72cf15
#
# 
# 
# add_file "packages/glibc/glibc-stage.inc"
#  content [c50ef9d6a30c9a54b38d3166f9c5c13a1535a9e6]
# 
# patch "packages/glibc/eglibc_svn.bb"
#  from [212e444094c694fad0d0b243de740753f10ed55b]
#    to [f37cb5c2f3c0bbc766306cbd58bd7aaf336de265]
# 
# patch "packages/glibc/glibc-initial.inc"
#  from [6884007e5d7a90d96f5221c1505e98036f28a186]
#    to [edf86eee3b82e6c856795cfdf29481c1119ea9eb]
# 
# patch "packages/glibc/glibc_2.2.5.bb"
#  from [b60012cb66eaa218a4211b1b00dea5abf5edc57e]
#    to [c1e515394463dc364c06a656f0ddca88820ee0a6]
# 
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
#  from [b4359b2c37ba0e9a9efb05449dbd276a415dd58c]
#    to [593e4712d3d43431b6f8919f67a9930b72a4e1bf]
# 
# patch "packages/glibc/glibc_2.3.2.bb"
#  from [acb2e796eed3503e93fc9185f25ceb8fd6d08192]
#    to [5ae4ab308791d0233d0727401a2b1b27fe86cd8f]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
#  from [88f1350f1c7a6cbb497959a8a1e4455a69db0920]
#    to [37a55b8a5d673a9e53780988088e113f8efc03b3]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
#  from [919a8c98d395b0551b87a5ed37d92dce15fe0db6]
#    to [337ce343170957ddb27b77215378bfdf33120ff2]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
#  from [9df1e523bbb241ea77f9a42f3a1705e3929ac476]
#    to [8c328417ffa3d0f27b718b4a29f585ae6fb8da4d]
# 
# patch "packages/glibc/glibc_2.3.3.bb"
#  from [90e63e009d2f6f56a145e4311c8a40c1e2688dec]
#    to [70572cfa1611f3d7fe0cc099e5aa2ad7e6b54284]
# 
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
#  from [a55065b99ab939261deb4f12df9cd45732d8d803]
#    to [efec7184df266e97402d2e31d0d12e1b1af16e1a]
# 
# patch "packages/glibc/glibc_2.4.bb"
#  from [167695f09f46b0437640fa75ad34b85edd2a6590]
#    to [6f8f5b26e247b17ac6456d6714d55cd940d438f0]
# 
# patch "packages/glibc/glibc_2.5.bb"
#  from [af0b010317c6304cbb206aab68c72e9c1c1f59a2]
#    to [8ac7425ca9ce3afc7815704e7a491f9181155746]
# 
# patch "packages/glibc/glibc_2.6.1.bb"
#  from [23c7eaecef99f38c791cb4d812d451055a3924fb]
#    to [1753994ceec7d4c54e81239f486d92052e46c752]
# 
# patch "packages/glibc/glibc_cvs.bb"
#  from [12d6ab5c7d2403f07afda67d7b1fbf30f9b02fd4]
#    to [89fcac9c32b7a1c0b7f0fcfd4f12739d8d40cf78]
# 
============================================================
--- packages/glibc/glibc-stage.inc	c50ef9d6a30c9a54b38d3166f9c5c13a1535a9e6
+++ packages/glibc/glibc-stage.inc	c50ef9d6a30c9a54b38d3166f9c5c13a1535a9e6
@@ -0,0 +1,23 @@
+do_stage() {
+	rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
+	oe_runmake 'install_root=${STAGING_DIR_HOST}' \
+		   'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
+		   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
+		   install-headers install-lib
+
+	install -d ${STAGING_INCDIR}/gnu \
+		   ${STAGING_INCDIR}/bits \
+		   ${STAGING_INCDIR}/rpcsvc
+	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
+	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
+	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
+	for r in ${rpcsvc}; do
+		h=`echo $r|sed -e's,\.x$,.h,'`
+		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
+	done
+	for i in libc.a libc_pic.a libc_nonshared.a; do
+		install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
+	done
+	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so
+	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
+}
============================================================
--- packages/glibc/eglibc_svn.bb	212e444094c694fad0d0b243de740753f10ed55b
+++ packages/glibc/eglibc_svn.bb	f37cb5c2f3c0bbc766306cbd58bd7aaf336de265
@@ -15,7 +15,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NAT
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 
============================================================
--- packages/glibc/glibc-initial.inc	6884007e5d7a90d96f5221c1505e98036f28a186
+++ packages/glibc/glibc-initial.inc	edf86eee3b82e6c856795cfdf29481c1119ea9eb
@@ -30,14 +30,14 @@ do_stage () {
 }
 
 do_stage () {
-	oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
+	oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir='${layout_includedir}' prefix='${layout_prefix}' install-headers
 
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-	mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
-	touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
-	cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
+	mkdir -p ${STAGING_INCDIR}/gnu
+	touch ${STAGING_INCDIR}/gnu/stubs.h
+	cp ${S}/include/features.h ${STAGING_INCDIR}/features.h
 }
 
 do_install () {
============================================================
--- packages/glibc/glibc_2.2.5.bb	b60012cb66eaa218a4211b1b00dea5abf5edc57e
+++ packages/glibc/glibc_2.2.5.bb	c1e515394463dc364c06a656f0ddca88820ee0a6
@@ -158,10 +158,10 @@ do_stage() {
 }
 
 do_stage() {
-	rm -f ${STAGING_LIBDIR}/libc.so.6
-	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${STAGING_LIBDIR}/libc.so.6' \
+	rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
+	oe_runmake 'install_root=${STAGING_DIR_HOST}' \
+		   'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
+		   '${STAGING_DIR_HOST}${layout_base_libdir}libc.so.6' \
 		   '${STAGING_INCDIR}/bits/errno.h' \
 		   '${STAGING_INCDIR}/bits/libc-lock.h' \
 		   '${STAGING_INCDIR}/gnu/stubs.h' \
@@ -187,9 +187,9 @@ do_stage() {
 		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
 	done
 	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
+		install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
 	done
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
 }
 
 require glibc-package.bbclass
============================================================
--- packages/glibc/glibc_2.3.2+cvs20040726.bb	b4359b2c37ba0e9a9efb05449dbd276a415dd58c
+++ packages/glibc/glibc_2.3.2+cvs20040726.bb	593e4712d3d43431b6f8919f67a9930b72a4e1bf
@@ -70,28 +70,6 @@ do_compile () {
 	)
 }
 
-do_stage() {
-	rm -f ${STAGING_LIBDIR}/libc.so.6
-	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${STAGING_LIBDIR}/libc.so.6' \
-		   install-headers install-lib
+require glibc-stage.inc
 
-	install -d ${STAGING_INCDIR}/gnu \
-		   ${STAGING_INCDIR}/bits \
-		   ${STAGING_INCDIR}/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
-	done
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-}
-
 require glibc-package.bbclass
============================================================
--- packages/glibc/glibc_2.3.2.bb	acb2e796eed3503e93fc9185f25ceb8fd6d08192
+++ packages/glibc/glibc_2.3.2.bb	5ae4ab308791d0233d0727401a2b1b27fe86cd8f
@@ -156,28 +156,6 @@ do_compile () {
 	)
 }
 
-do_stage() {
-	rm -f ${STAGING_LIBDIR}/libc.so.6
-	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${STAGING_LIBDIR}/libc.so.6' \
-		   install-headers install-lib
+require glibc-stage.inc
 
-	install -d ${STAGING_INCDIR}/gnu \
-		   ${STAGING_INCDIR}/bits \
-		   ${STAGING_INCDIR}/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
-	done
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-}
-
 require glibc-package.bbclass
============================================================
--- packages/glibc/glibc_2.3.3+cvs20041128.bb	88f1350f1c7a6cbb497959a8a1e4455a69db0920
+++ packages/glibc/glibc_2.3.3+cvs20041128.bb	37a55b8a5d673a9e53780988088e113f8efc03b3
@@ -92,28 +92,6 @@ do_compile () {
 	)
 }
 
-do_stage() {
-	rm -f ${STAGING_LIBDIR}/libc.so.6
-	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${STAGING_LIBDIR}/libc.so.6' \
-		   install-headers install-lib
+require glibc-stage.inc
 
-	install -d ${STAGING_INCDIR}/gnu \
-		   ${STAGING_INCDIR}/bits \
-		   ${STAGING_INCDIR}/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
-	done
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-}
-
 require glibc-package.bbclass
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050221.bb	919a8c98d395b0551b87a5ed37d92dce15fe0db6
+++ packages/glibc/glibc_2.3.3+cvs20050221.bb	337ce343170957ddb27b77215378bfdf33120ff2
@@ -75,28 +75,6 @@ do_compile () {
 	)
 }
 
-do_stage() {
-	rm -f ${STAGING_LIBDIR}/libc.so.6
-	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${STAGING_LIBDIR}/libc.so.6' \
-		   install-headers install-lib
+require glibc-stage.inc
 
-	install -d ${STAGING_INCDIR}/gnu \
-		   ${STAGING_INCDIR}/bits \
-		   ${STAGING_INCDIR}/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
-	done
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-}
-
 require glibc-package.bbclass
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050420.bb	9df1e523bbb241ea77f9a42f3a1705e3929ac476
+++ packages/glibc/glibc_2.3.3+cvs20050420.bb	8c328417ffa3d0f27b718b4a29f585ae6fb8da4d
@@ -76,28 +76,6 @@ do_compile () {
 	)
 }
 
-do_stage() {
-	rm -f ${STAGING_LIBDIR}/libc.so.6
-	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${STAGING_LIBDIR}/libc.so.6' \
-		   install-headers install-lib
+require glibc-stage.inc
 
-	install -d ${STAGING_INCDIR}/gnu \
-		   ${STAGING_INCDIR}/bits \
-		   ${STAGING_INCDIR}/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
-	done
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-}
-
 require glibc-package.bbclass
============================================================
--- packages/glibc/glibc_2.3.3.bb	90e63e009d2f6f56a145e4311c8a40c1e2688dec
+++ packages/glibc/glibc_2.3.3.bb	70572cfa1611f3d7fe0cc099e5aa2ad7e6b54284
@@ -101,28 +101,6 @@ do_compile () {
 	)
 }
 
-do_stage() {
-	rm -f ${STAGING_LIBDIR}/libc.so.6
-	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${STAGING_LIBDIR}/libc.so.6' \
-		   install-headers install-lib
+require glibc-stage.inc
 
-	install -d ${STAGING_INCDIR}/gnu \
-		   ${STAGING_INCDIR}/bits \
-		   ${STAGING_INCDIR}/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
-	done
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-}
-
 require glibc-package.bbclass
============================================================
--- packages/glibc/glibc_2.3.5+cvs20050627.bb	a55065b99ab939261deb4f12df9cd45732d8d803
+++ packages/glibc/glibc_2.3.5+cvs20050627.bb	efec7184df266e97402d2e31d0d12e1b1af16e1a
@@ -129,28 +129,6 @@ do_compile () {
 	)
 }
 
-do_stage() {
-	rm -f ${STAGING_LIBDIR}/libc.so.6
-	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${STAGING_LIBDIR}/libc.so.6' \
-		   install-headers install-lib
+require glibc-stage.inc
 
-	install -d ${STAGING_INCDIR}/gnu \
-		   ${STAGING_INCDIR}/bits \
-		   ${STAGING_INCDIR}/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
-	done
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-}
-
 require glibc-package.bbclass
============================================================
--- packages/glibc/glibc_2.4.bb	167695f09f46b0437640fa75ad34b85edd2a6590
+++ packages/glibc/glibc_2.4.bb	6f8f5b26e247b17ac6456d6714d55cd940d438f0
@@ -8,7 +8,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NAT
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
@@ -113,7 +113,6 @@ addtask munge before do_patch after do_u
 
 addtask munge before do_patch after d%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list