From: Gerald Britton <gbritton@doomcom.org>
Date: Sun, 9 May 2004 19:34:59 +0000 (+0000)
Subject: Merge ssh://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~19246
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f89f6f91c15ca00fd0966bd24d73642753d744f;p=openembedded.git

Merge ssh://openembedded@openembedded.bkbits.net/packages
into doomcom.org:/home/gbritton/devel/OE/packages

2004/05/09 15:34:52-04:00 doomcom.org!gbritton
remove conflicting uclibc bits/atomicity.h (conflicted with libstdc++)

BKrev: 409e87e3TAPjH15aYMnHbodh1U3YEQ
---

diff --git a/uclibc/uclibc-initial_0.9.26.oe b/uclibc/uclibc-initial_0.9.26.oe
index daa4cb013a..fc0b5e0445 100644
--- a/uclibc/uclibc-initial_0.9.26.oe
+++ b/uclibc/uclibc-initial_0.9.26.oe
@@ -16,6 +16,9 @@ do_stage() {
 	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
 	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
+
+	# This conflicts with the c++ version of this header
+	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe
index 8008b5c0e7..cfd434f953 100644
--- a/uclibc/uclibc_0.9.26.oe
+++ b/uclibc/uclibc_0.9.26.oe
@@ -102,12 +102,15 @@ do_stage() {
 	rm -f ${UCLIBC_PREFIX}/include/.cvsignore
 
 	# Fixup shared lib symlinks
-	( cd ${UCLIBC_STAGE_PREFIX}/lib
+	( cd ${UCLIBC_PREFIX}/lib
 		for f in c crypt dl m nsl pthread resolv thread_db util; do
 			ln -sf lib${f}.so.? lib${f}.so
 		done
 	)
 
+	# This conflicts with the c++ version of this header
+	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+
 	# Install into the staging dir
 	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
 		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
@@ -122,6 +125,9 @@ do_stage() {
 			ln -sf lib${f}.so.? lib${f}.so
 		done
 	)
+
+	# This conflicts with the c++ version of this header
+	rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
@@ -130,5 +136,8 @@ do_install() {
 
 	# We don't really need this in /usr/include
 	rm -f ${D}/${prefix}/include/.cvsignore
+
+	# This conflicts with the c++ version of this header
+	rm -f ${D}/${prefix}/include/bits/atomicity.h
 }