From 8979ceed2e9ed94a2022a1c760bdec38e16e05d0 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 4 Aug 2006 09:42:49 +0000
Subject: hostap-conf: synced with .oz354x (added two cards)

---
 packages/hostap/files/hostap_cs.conf     | 8 ++++++++
 packages/hostap/files/hostap_cs.modalias | 3 +++
 packages/hostap/hostap-conf_1.0.bb       | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/hostap/files/hostap_cs.conf b/packages/hostap/files/hostap_cs.conf
index abf9c7a247..8dda82aad3 100644
--- a/packages/hostap/files/hostap_cs.conf
+++ b/packages/hostap/files/hostap_cs.conf
@@ -183,3 +183,11 @@ card "BENQ AWL100"
   version "BENQ", "AWL100 PCMCIA ADAPTER"
   bind "hostap_cs"
 
+card "Pretec WLAN"
+  version "Pretec", "CompactWLAN Card 802.11b", "2.5"
+  manfid 0x0156, 0x0002
+  bind "hostap_cs"
+
+card "TrendNet TEW PC16"
+  manfid 0x0274, 0x1601
+  bind "hostap_cs"
diff --git a/packages/hostap/files/hostap_cs.modalias b/packages/hostap/files/hostap_cs.modalias
index 9334fa88d0..cb9efab271 100644
--- a/packages/hostap/files/hostap_cs.modalias
+++ b/packages/hostap/files/hostap_cs.modalias
@@ -23,3 +23,6 @@ pcmcia:mD601c0010f06fn00pfn00pa4703CF68pbFAD7318Dpc00000000pd00000000 hostap_cs
 
 # 0x0156, 0x0002 and "Version 01.02" only appear for Prism based cards.
 pcmcia:m0156c0002f06fn00pfn00pa*pb*pc4B74BAA0pd00000000 hostap_cs
+
+# "BUFFALO", "WLI-CF-S11G", "", ""
+pcmcia:m026Fc030Bf06fn00pfn00pa2DECECE3pb82067C18pc00000000pd00000000 hostap_cs
diff --git a/packages/hostap/hostap-conf_1.0.bb b/packages/hostap/hostap-conf_1.0.bb
index e6d2e4454a..7f407e8f9a 100644
--- a/packages/hostap/hostap-conf_1.0.bb
+++ b/packages/hostap/hostap-conf_1.0.bb
@@ -4,7 +4,7 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "GPL"
 PACKAGE_ARCH = "all"
-PR = "r5"
+PR = "r8"
 
 SRC_URI = "file://hostap_cs.conf \
            file://hostap_cs.modalias \
-- 
cgit v1.2.3


From a772b676c466527fe210eaedc25f00b0552dfc32 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 4 Aug 2006 23:32:32 +0000
Subject: libcontactsdb: add 0.5

---
 packages/libcontactsdb/libcontactsdb_0.5.bb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/libcontactsdb/libcontactsdb_0.5.bb

diff --git a/packages/libcontactsdb/libcontactsdb_0.5.bb b/packages/libcontactsdb/libcontactsdb_0.5.bb
new file mode 100644
index 0000000000..93950a3e1c
--- /dev/null
+++ b/packages/libcontactsdb/libcontactsdb_0.5.bb
@@ -0,0 +1,15 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Database access library for GPE contacts"
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "libgpewidget libgpepimc sqlite"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+PR = "r0"
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit autotools gpe pkgconfig
+
+do_stage () {
+autotools_stage_all
+}
-- 
cgit v1.2.3


From f5ae05c607c05c6a6a1cc24cddb3e8864162f5a6 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 4 Aug 2006 23:35:57 +0000
Subject: gpe-contacts: Add 0.46, drop ancient versions.

---
 packages/gpe-contacts/gpe-contacts_0.43.bb | 14 --------------
 packages/gpe-contacts/gpe-contacts_0.44.bb | 14 --------------
 packages/gpe-contacts/gpe-contacts_0.46.bb | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 packages/gpe-contacts/gpe-contacts_0.43.bb
 delete mode 100644 packages/gpe-contacts/gpe-contacts_0.44.bb
 create mode 100644 packages/gpe-contacts/gpe-contacts_0.46.bb

diff --git a/packages/gpe-contacts/gpe-contacts_0.43.bb b/packages/gpe-contacts/gpe-contacts_0.43.bb
deleted file mode 100644
index b5afbb3a3c..0000000000
--- a/packages/gpe-contacts/gpe-contacts_0.43.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-PR = "r0"
-
-DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE contacts manager"
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-
-FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts"
-
diff --git a/packages/gpe-contacts/gpe-contacts_0.44.bb b/packages/gpe-contacts/gpe-contacts_0.44.bb
deleted file mode 100644
index b5afbb3a3c..0000000000
--- a/packages/gpe-contacts/gpe-contacts_0.44.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-PR = "r0"
-
-DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE contacts manager"
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-
-FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts"
-
diff --git a/packages/gpe-contacts/gpe-contacts_0.46.bb b/packages/gpe-contacts/gpe-contacts_0.46.bb
new file mode 100644
index 0000000000..879a4bf691
--- /dev/null
+++ b/packages/gpe-contacts/gpe-contacts_0.46.bb
@@ -0,0 +1,15 @@
+LICENSE = "GPL"
+MAINTAINER = "Florian Boor <fb@kernelconcepts.de>
+inherit gpe autotools
+
+PR = "r0"
+
+DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
+SECTION = "gpe"
+RDEPENDS = "gpe-icons"
+DESCRIPTION = "GPE contacts manager"
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
+
+
+FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts"
+
-- 
cgit v1.2.3


From 44b1ddb504535400e1272d5d9259778249f36b47 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 6 Aug 2006 00:37:41 +0000
Subject: packages/autoconf/autoconf: Update SIZE_OF check. Use the new $SIZE
 check only on cross compiling, try to use arm-linux-size from binutils    
 Guard the new and old size_of check using if $cross_compiling test     return
 true otherwise you use the old code.     Also backport the
 AC_CHECK_TARGET_TOOL method from autocon-2.60 and     make use of it when
 finding a size tool.

---
 packages/autoconf/autoconf-2.59/sizeof_types.patch | 64 ++++++++++++++++------
 1 file changed, 46 insertions(+), 18 deletions(-)

diff --git a/packages/autoconf/autoconf-2.59/sizeof_types.patch b/packages/autoconf/autoconf-2.59/sizeof_types.patch
index 0f1e0d1fee..30fd5c1926 100644
--- a/packages/autoconf/autoconf-2.59/sizeof_types.patch
+++ b/packages/autoconf/autoconf-2.59/sizeof_types.patch
@@ -3,15 +3,38 @@
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
 #
 
---- autoconf-2.59/lib/autoconf/types.m4~sizeof_types.patch	2003-05-22 08:05:14.000000000 -0400
-+++ autoconf-2.59/lib/autoconf/types.m4	2004-05-29 01:31:24.828295015 -0400
-@@ -380,32 +380,38 @@
+Index: autoconf-2.59/lib/autoconf/types.m4
+===================================================================
+--- autoconf-2.59.orig/lib/autoconf/types.m4	2003-05-22 14:05:14.000000000 +0200
++++ autoconf-2.59/lib/autoconf/types.m4	2006-08-06 02:05:02.000000000 +0200
+@@ -380,26 +380,66 @@
  # Generic checks.  #
  # ---------------- #
  
++# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60
++# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH )
++# ------------------------------------------------------------------------
++# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
++AC_DEFUN([AC_CHECK_TARGET_TOOL],
++[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
++AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4])
++if test -z "$ac_cv_prog_$1"; then
++  if test "$build" = "$target"; then
++    ac_ct_$1=$$1
++    AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
++    $1=ac_ct_$1
++  else
++    $1="$3"
++  fi
++else
++  $1="$ac_cv_prog_$1"
++fi
++])# AC_CHECK_TARGET_TOOL
++
++
 +AC_DEFUN([AC_PROG_SIZE],
 +[
-+  AC_CHECK_TOOL(SIZE, size, :)
++  AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH])
 +])
  
  # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
@@ -35,14 +58,25 @@
 -		  [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
 +[
 +if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
-+		   [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
-+		   [
-+		     AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
-+		   ],
-+		   [
-+		     AS_TR_SH([ac_cv_sizeof_$1])=0
-+		   ])
++	if test "$cross_compiling" = yes; then
++	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
++			   [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
++			   [
++			     AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
++			   ],
++			   [
++			     AS_TR_SH([ac_cv_sizeof_$1])=0
++			   ])
++	else
++		# The cast to unsigned long works around a bug in the HP C Compiler
++		# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++		# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++		# This bug is HP SR number 8606223364.
++		_AC_COMPUTE_INT([(long) (sizeof ($1))],
++			[AS_TR_SH([ac_cv_sizeof_$1])],
++			[AC_INCLUDES_DEFAULT([$3])],
++			[AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
++	fi
  else
    AS_TR_SH([ac_cv_sizeof_$1])=0
 -fi])dnl
@@ -51,9 +85,3 @@
  AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]),
  		   [The size of a `$1', as computed by sizeof.])
  ])# AC_CHECK_SIZEOF
- 
--
--
- # ---------------- #
- # Generic checks.  #
- # ---------------- #
-- 
cgit v1.2.3


From b8d1ef0e4fb7c506a5c0de055a276159049df948 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 6 Aug 2006 11:45:56 +0000
Subject: packages/gcc: For targets (libstdc++,java,mudflap...) use xgcc -E as
 CPP     GCC compiles the xgcc cross compiler and will compile target    
 libraries e.g. libstdc++. It uses autoconf to configure the target    
 libraries which uses /usr/bin/cpp to determine the presence of     host
 includes.     By using xgcc we will not risk to include /usr/include to find
 standard     headers. If we do our cross compile check will hit.     The gcc
 3.4 series patch only addresses target-libstdc++ where the     gcc3.3 and
 gcc4 series patch all targets

---
 packages/gcc/gcc-3.3.3/zecke-xgcc-cpp.patch        | 13 +++++++++++++
 packages/gcc/gcc-3.3.4/zecke-xgcc-cpp.patch        | 13 +++++++++++++
 packages/gcc/gcc-3.4.3/zecke-xgcc-cpp.patch        | 16 ++++++++++++++++
 packages/gcc/gcc-3.4.4/zecke-xgcc-cpp.patch        | 13 +++++++++++++
 packages/gcc/gcc-4.0.0/zecke-xgcc-cpp.patch        | 12 ++++++++++++
 packages/gcc/gcc-4.0.2/zecke-xgcc-cpp.patch        | 12 ++++++++++++
 packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch | 12 ++++++++++++
 packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch        | 12 ++++++++++++
 packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch        | 12 ++++++++++++
 packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch | 12 ++++++++++++
 packages/gcc/gcc_3.3.3.bb                          |  1 +
 packages/gcc/gcc_3.3.4.bb                          |  1 +
 packages/gcc/gcc_3.4.3.bb                          |  3 ++-
 packages/gcc/gcc_3.4.4.bb                          |  3 ++-
 packages/gcc/gcc_4.0.0.bb                          |  1 +
 packages/gcc/gcc_4.0.2.bb                          |  3 ++-
 packages/gcc/gcc_4.1-20060217.bb                   |  1 +
 packages/gcc/gcc_4.1.0.bb                          |  1 +
 packages/gcc/gcc_4.1.1.bb                          |  3 ++-
 packages/gcc/gcc_4.2-20060513.bb                   |  1 +
 packages/glibc/glibc_2.3.5+cvs20050627.bb          |  1 +
 21 files changed, 142 insertions(+), 4 deletions(-)
 create mode 100644 packages/gcc/gcc-3.3.3/zecke-xgcc-cpp.patch
 create mode 100644 packages/gcc/gcc-3.3.4/zecke-xgcc-cpp.patch
 create mode 100644 packages/gcc/gcc-3.4.3/zecke-xgcc-cpp.patch
 create mode 100644 packages/gcc/gcc-3.4.4/zecke-xgcc-cpp.patch
 create mode 100644 packages/gcc/gcc-4.0.0/zecke-xgcc-cpp.patch
 create mode 100644 packages/gcc/gcc-4.0.2/zecke-xgcc-cpp.patch
 create mode 100644 packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch
 create mode 100644 packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch
 create mode 100644 packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
 create mode 100644 packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch

diff --git a/packages/gcc/gcc-3.3.3/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.3.3/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..d12562761f
--- /dev/null
+++ b/packages/gcc/gcc-3.3.3/zecke-xgcc-cpp.patch
@@ -0,0 +1,13 @@
+Index: gcc-3.3.3/Makefile.in
+===================================================================
+--- gcc-3.3.3.orig/Makefile.in	2003-07-05 04:37:08.000000000 +0200
++++ gcc-3.3.3/Makefile.in	2006-08-06 12:57:53.000000000 +0200
+@@ -1355,6 +1355,8 @@
+ 	    AS="$(AS_FOR_TARGET)"; export AS; \
+ 	    CC="$(CC_FOR_TARGET)"; export CC; \
+ 	    CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	    CPP="$(CC_FOR_TARGET) -E"; export CPP; \
++	    CPPFLAGS=""; export CPPFLAGS; \
+ 	    CXX="$(CXX_FOR_TARGET)"; export CXX; \
+ 	    CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+ 	    GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
diff --git a/packages/gcc/gcc-3.3.4/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.3.4/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..d42ab6d57d
--- /dev/null
+++ b/packages/gcc/gcc-3.3.4/zecke-xgcc-cpp.patch
@@ -0,0 +1,13 @@
+Index: gcc-3.3.4/Makefile.in
+===================================================================
+--- gcc-3.3.4.orig/Makefile.in	2003-07-05 04:37:08.000000000 +0200
++++ gcc-3.3.4/Makefile.in	2006-08-06 13:00:16.000000000 +0200
+@@ -1355,6 +1355,8 @@
+ 	    AS="$(AS_FOR_TARGET)"; export AS; \
+ 	    CC="$(CC_FOR_TARGET)"; export CC; \
+ 	    CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	    CPP="$(CC_FOR_TARGET) -E"; export CPP; \
++	    CPPFLAGS=""; export CPPFLAGS; \
+ 	    CXX="$(CXX_FOR_TARGET)"; export CXX; \
+ 	    CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+ 	    GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
diff --git a/packages/gcc/gcc-3.4.3/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.4.3/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..08e7a3124d
--- /dev/null
+++ b/packages/gcc/gcc-3.4.3/zecke-xgcc-cpp.patch
@@ -0,0 +1,16 @@
+In contrast to the other versions this only patches libstdc++
+
+
+Index: gcc-3.4.3/Makefile.in
+===================================================================
+--- gcc-3.4.3.orig/Makefile.in	2004-11-05 05:14:05.000000000 +0100
++++ gcc-3.4.3/Makefile.in	2006-08-06 13:03:37.000000000 +0200
+@@ -21964,6 +21964,8 @@
+ 	AS="$(AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
++	CPPFLAGS=""; export CPPFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
diff --git a/packages/gcc/gcc-3.4.4/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.4.4/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..ab6a3fd771
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4/zecke-xgcc-cpp.patch
@@ -0,0 +1,13 @@
+Index: gcc-3.4.4/Makefile.in
+===================================================================
+--- gcc-3.4.4.orig/Makefile.in	2005-05-19 11:58:00.000000000 +0200
++++ gcc-3.4.4/Makefile.in	2006-08-06 13:08:14.000000000 +0200
+@@ -21964,6 +21964,8 @@
+ 	AS="$(AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
++	CPPFLAGS=""; export CPPFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
diff --git a/packages/gcc/gcc-4.0.0/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.0.0/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..436eff02ae
--- /dev/null
+++ b/packages/gcc/gcc-4.0.0/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.0.0/Makefile.in
+===================================================================
+--- gcc-4.0.0.orig/Makefile.in	2005-04-21 09:04:10.000000000 +0200
++++ gcc-4.0.0/Makefile.in	2006-08-06 13:14:07.000000000 +0200
+@@ -197,6 +197,7 @@
+ 	AS="$(AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.0.2/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.0.2/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..ba7d7257d9
--- /dev/null
+++ b/packages/gcc/gcc-4.0.2/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.0.2/Makefile.in
+===================================================================
+--- gcc-4.0.2.orig/Makefile.in	2006-08-06 13:17:09.000000000 +0200
++++ gcc-4.0.2/Makefile.in	2006-08-06 13:18:35.000000000 +0200
+@@ -197,6 +197,7 @@
+ 	AS="$(AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..8b53f653c6
--- /dev/null
+++ b/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.1-20060217/Makefile.in
+===================================================================
+--- gcc-4.1-20060217.orig/Makefile.in	2005-12-15 15:02:02.000000000 +0100
++++ gcc-4.1-20060217/Makefile.in	2006-08-06 13:23:23.000000000 +0200
+@@ -194,6 +194,7 @@
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..120cf55a0f
--- /dev/null
+++ b/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.1.0/Makefile.in
+===================================================================
+--- gcc-4.1.0.orig/Makefile.in	2005-12-15 15:02:02.000000000 +0100
++++ gcc-4.1.0/Makefile.in	2006-08-06 13:29:36.000000000 +0200
+@@ -194,6 +194,7 @@
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..42ec190600
--- /dev/null
+++ b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.1.1/Makefile.in
+===================================================================
+--- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
++++ gcc-4.1.1/Makefile.in	2006-08-06 13:32:46.000000000 +0200
+@@ -194,6 +194,7 @@
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..ba7d7257d9
--- /dev/null
+++ b/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.0.2/Makefile.in
+===================================================================
+--- gcc-4.0.2.orig/Makefile.in	2006-08-06 13:17:09.000000000 +0200
++++ gcc-4.0.2/Makefile.in	2006-08-06 13:18:35.000000000 +0200
+@@ -197,6 +197,7 @@
+ 	AS="$(AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb
index 7f0091a18e..f46c481f69 100644
--- a/packages/gcc/gcc_3.3.3.bb
+++ b/packages/gcc/gcc_3.3.3.bb
@@ -93,6 +93,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc-uclibc-3.3-110-conf.patch;patch=1 \
 	file://gcc-uclibc-3.3-120-softfloat.patch;patch=1 \
 	file://gcc-uclibc-3.3-200-code.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://bash3.patch;patch=1"
 
 MIRRORS_prepend () {
diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb
index dc3a66cd29..4a1d146dbb 100644
--- a/packages/gcc/gcc_3.3.4.bb
+++ b/packages/gcc/gcc_3.3.4.bb
@@ -70,6 +70,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc-uclibc-3.3-110-conf.patch;patch=1 \
 	   file://gcc-uclibc-3.3-120-softfloat.patch;patch=1 \
 	   file://gcc-uclibc-3.3-200-code.patch;patch=1 \
+	   file://zecke-xgcc-cpp.patch;patch=1 \
 	   file://bash3.patch;patch=1"
 
 PREMIRRORS_prepend () {
diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb
index c7c6d3e8c9..906465b1a9 100644
--- a/packages/gcc/gcc_3.4.3.bb
+++ b/packages/gcc/gcc_3.4.3.bb
@@ -23,6 +23,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://GCC3.4.0VisibilityPatch.diff;patch=1 \
 	   file://15342.patch;patch=1 \
 	   file://always-fixincperm.patch;patch=1 \
-	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1"
+	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
+	   file://zecke-xgcc-cpp.patch;patch=1 "
 
 require gcc3-build.inc
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 144852f15a..fece12cab0 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -23,7 +23,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://GCC3.4.0VisibilityPatch.diff;patch=1 \
 	   file://15342.patch;patch=1 \
 	   file://always-fixincperm.patch;patch=1 \
-	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1"
+	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
+	   file://zecke-xgcc-cpp.patch;patch=1 "
 
 SRC_URI += "file://gcc34-configure.in.patch;patch=1"
 SRC_URI += "file://gcc34-thumb-support.patch;patch=1"
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index 0c708984c0..cf9d704c45 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -10,6 +10,7 @@ inherit autotools gettext
 require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index b5b85a983f..73ff96e28c 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -14,7 +14,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
 	file://ldflags.patch;patch=1 \
-	file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch;patch=1"
+	file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 "
 
 # uclibc patches below
 SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
diff --git a/packages/gcc/gcc_4.1-20060217.bb b/packages/gcc/gcc_4.1-20060217.bb
index bcd9e9f235..6889f04a36 100644
--- a/packages/gcc/gcc_4.1-20060217.bb
+++ b/packages/gcc/gcc_4.1-20060217.bb
@@ -12,6 +12,7 @@ require gcc-package.inc
 SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-20060217.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 80a4b89d7c..862a1dfe5b 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -12,6 +12,7 @@ require gcc-package.inc
 SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 17367b67d4..e2d3d25ea8 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -26,7 +26,8 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 	file://arm-thumb.patch;patch=1 \
 	file://arm-thumb-cache.patch;patch=1 \
 	file://ldflags.patch;patch=1 \
-	file://cse.patch;patch=1"
+	file://cse.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 "
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
diff --git a/packages/gcc/gcc_4.2-20060513.bb b/packages/gcc/gcc_4.2-20060513.bb
index 5b68fb254b..8960469a18 100644
--- a/packages/gcc/gcc_4.2-20060513.bb
+++ b/packages/gcc/gcc_4.2-20060513.bb
@@ -12,6 +12,7 @@ require gcc-package.inc
 SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index cea9f85675..9343ab9cc1 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -55,6 +55,7 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat
 	   file://ldsocache-varrun.patch;patch=1 \
 	   file://5090_all_stubs-rule-fix.patch;patch=1 \
 	   file://raise.patch;patch=1 \
+	   file://zecke-sane-readelf.patch;patch=1 \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
-- 
cgit v1.2.3


From 40cfb6027e7d0f793af99fbf8c92b2401d0fcd44 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 6 Aug 2006 12:31:17 +0000
Subject: packages/glibc: Add patch, patch glibc2.4 to use $target-readelf    
 Use $target-readelf instead of hardcoding readelf which is not     present on
 non GNU, non binutils system.

---
 packages/glibc/glibc-2.4/zecke-sane-readelf.patch  | 149 +++++++++++++++++++++
 .../glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch | 149 +++++++++++++++++++++
 packages/glibc/glibc_2.4.bb                        |   1 +
 3 files changed, 299 insertions(+)
 create mode 100644 packages/glibc/glibc-2.4/zecke-sane-readelf.patch
 create mode 100644 packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch

diff --git a/packages/glibc/glibc-2.4/zecke-sane-readelf.patch b/packages/glibc/glibc-2.4/zecke-sane-readelf.patch
new file mode 100644
index 0000000000..023b6a51bc
--- /dev/null
+++ b/packages/glibc/glibc-2.4/zecke-sane-readelf.patch
@@ -0,0 +1,149 @@
+Index: glibc-2.4/configure
+===================================================================
+--- glibc-2.4.orig/configure	2006-03-06 12:18:56.000000000 +0100
++++ glibc-2.4/configure	2006-08-06 14:10:51.000000000 +0200
+@@ -5488,6 +5488,95 @@
+     fi
+   fi
+ 
++### XXXX copy and pasted
++# Check for readelf
++# Extract the first word of "$target_alias-readelf", so it can be a program name with args.
++set dummy $target_alias-readelf; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_READELF+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$READELF"; then
++  ac_cv_prog_READELF="$READELF" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_READELF="$target_alias-readelf"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++READELF=$ac_cv_prog_READELF
++if test -n "$READELF"; then
++  { echo "$as_me:$LINENO: result: $READELF" >&5
++echo "${ECHO_T}$READELF" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++if test -z "$ac_cv_prog_READELF"; then
++  if test "$build" = "$target"; then
++    ac_ct_READELF=$READELF
++    # Extract the first word of "readelf", so it can be a program name with args.
++set dummy readelf; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_READELF+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_READELF"; then
++  ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_READELF="readelf"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++  test -z "$ac_cv_prog_ac_ct_READELF" && ac_cv_prog_ac_ct_READELF="readelf"
++fi
++fi
++ac_ct_READELF=$ac_cv_prog_ac_ct_READELF
++if test -n "$ac_ct_READELF"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_READELF" >&5
++echo "${ECHO_T}$ac_ct_READELF" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++    READELF=ac_ct_READELF
++  else
++    READELF="readelf"
++  fi
++else
++  READELF="$ac_cv_prog_READELF"
++fi
++
++### XXXX copy and pasted
++
+   echo "$as_me:$LINENO: checking for .preinit_array/.init_array/.fini_array support" >&5
+ echo $ECHO_N "checking for .preinit_array/.init_array/.fini_array support... $ECHO_C" >&6
+ if test "${libc_cv_initfini_array+set}" = set; then
+@@ -5507,7 +5596,7 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }
+   then
+-    if readelf -S conftest | fgrep INIT_ARRAY > /dev/null; then
++    if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then
+       libc_cv_initfini_array=yes
+     else
+       libc_cv_initfini_array=no
+@@ -5801,7 +5890,7 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }
+   then
+-    if readelf -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++    if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
+       libc_cv_z_combreloc=yes
+     else
+       libc_cv_z_combreloc=no
+Index: glibc-2.4/configure.in
+===================================================================
+--- glibc-2.4.orig/configure.in	2006-03-01 10:17:40.000000000 +0100
++++ glibc-2.4/configure.in	2006-08-06 14:09:31.000000000 +0200
+@@ -1350,6 +1350,8 @@
+     fi
+   fi
+ 
++  AC_CHECK_TARGET_TOOL([READELF],[readelf],[readelf],[$PATH])
++
+   AC_CACHE_CHECK(for .preinit_array/.init_array/.fini_array support,
+ 		 libc_cv_initfini_array, [dnl
+   cat > conftest.c <<EOF
+@@ -1361,7 +1363,7 @@
+   if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest conftest.c
+ 		     -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD])
+   then
+-    if readelf -S conftest | fgrep INIT_ARRAY > /dev/null; then
++    if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then
+       libc_cv_initfini_array=yes
+     else
+       libc_cv_initfini_array=no
+@@ -1543,7 +1545,7 @@
+ dnl introducing new options this is not easily doable.  Instead use a tool
+ dnl which always is cross-platform: readelf.  To detect whether -z combreloc
+ dnl look for a section named .rel.dyn.
+-    if readelf -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++    if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
+       libc_cv_z_combreloc=yes
+     else
+       libc_cv_z_combreloc=no
diff --git a/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch b/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch
new file mode 100644
index 0000000000..c57494f937
--- /dev/null
+++ b/packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch
@@ -0,0 +1,149 @@
+Index: glibc-2.3.2/configure
+===================================================================
+--- glibc-2.3.2.orig/configure	2006-08-05 20:18:11.000000000 +0200
++++ glibc-2.3.2/configure	2006-08-05 22:09:08.000000000 +0200
+@@ -4799,6 +4799,95 @@
+     fi
+   fi
+ 
++### XXXX copy and pasted
++# Check for readelf
++# Extract the first word of "$target_alias-readelf", so it can be a program name with args.
++set dummy $target_alias-readelf; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_READELF+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$READELF"; then
++  ac_cv_prog_READELF="$READELF" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_READELF="$target_alias-readelf"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++READELF=$ac_cv_prog_READELF
++if test -n "$READELF"; then
++  { echo "$as_me:$LINENO: result: $READELF" >&5
++echo "${ECHO_T}$READELF" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++if test -z "$ac_cv_prog_READELF"; then
++  if test "$build" = "$target"; then
++    ac_ct_READELF=$READELF
++    # Extract the first word of "readelf", so it can be a program name with args.
++set dummy readelf; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_READELF+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_READELF"; then
++  ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_READELF="readelf"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++  test -z "$ac_cv_prog_ac_ct_READELF" && ac_cv_prog_ac_ct_READELF="readelf"
++fi
++fi
++ac_ct_READELF=$ac_cv_prog_ac_ct_READELF
++if test -n "$ac_ct_READELF"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_READELF" >&5
++echo "${ECHO_T}$ac_ct_READELF" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++    READELF=ac_ct_READELF
++  else
++    READELF="readelf"
++  fi
++else
++  READELF="$ac_cv_prog_READELF"
++fi
++
++### XXXX copy and pasted
++
+   echo "$as_me:$LINENO: checking for .preinit_array/.init_array/.fini_array support" >&5
+ echo $ECHO_N "checking for .preinit_array/.init_array/.fini_array support... $ECHO_C" >&6
+ if test "${libc_cv_initfinit_array+set}" = set; then
+@@ -4818,7 +4907,7 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }
+   then
+-    if readelf -S conftest | fgrep INIT_ARRAY > /dev/null; then
++    if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then
+       libc_cv_initfinit_array=yes
+     else
+       libc_cv_initfinit_array=no
+@@ -4963,7 +5052,7 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }
+   then
+-    if readelf -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++    if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
+       libc_cv_z_combreloc=yes
+     else
+       libc_cv_z_combreloc=no
+Index: glibc-2.3.2/configure.in
+===================================================================
+--- glibc-2.3.2.orig/configure.in	2003-02-26 01:46:31.000000000 +0100
++++ glibc-2.3.2/configure.in	2006-08-05 22:05:32.000000000 +0200
+@@ -1187,6 +1187,8 @@
+     fi
+   fi
+ 
++  AC_CHECK_TARGET_TOOL([READELF],[readelf],[readelf],[$PATH])
++
+   AC_CACHE_CHECK(for .preinit_array/.init_array/.fini_array support,
+ 		 libc_cv_initfinit_array, [dnl
+   cat > conftest.c <<EOF
+@@ -1198,7 +1200,7 @@
+   if AC_TRY_COMMAND([${CC-cc} -o conftest conftest.c
+ 		     -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD])
+   then
+-    if readelf -S conftest | fgrep INIT_ARRAY > /dev/null; then
++    if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then
+       libc_cv_initfinit_array=yes
+     else
+       libc_cv_initfinit_array=no
+@@ -1290,7 +1292,7 @@
+ dnl introducing new options this is not easily doable.  Instead use a tool
+ dnl which always is cross-platform: readelf.  To detect whether -z combreloc
+ dnl look for a section named .rel.dyn.
+-    if readelf -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++    if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
+       libc_cv_z_combreloc=yes
+     else
+       libc_cv_z_combreloc=no
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index d4d024fde2..922db459fc 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -58,6 +58,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.4.tar.bz2 \
            file://nptl-crosscompile.patch;patch=1 \
 	   file://glibc-2.4-compile.patch;patch=1 \
 	   file://fixup-aeabi-syscalls.patch;patch=1 \
+	   file://zecke-sane-readelf.patch;patch=1 \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
-- 
cgit v1.2.3


From aea3bc79a39d0a3b4589f73c7907dd6d7b62b811 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 6 Aug 2006 13:10:20 +0000
Subject: packages/gmp/gmp-native: OSX/Darwin/gcc hack. Force gmp to not used
 assembly versions     Set none as CPU to force GMP to not use 'optimized'
 assembly which     does not compile with apple gcc (MacIntel).     Messing
 with TARGET_SYS etc. messes with CFLAGS, PATH as well. We do     not need to
 care for the CFLAGS for now, but we need to mess with the     PATH.

---
 packages/gmp/gmp-native_4.1.2.bb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/gmp/gmp-native_4.1.2.bb b/packages/gmp/gmp-native_4.1.2.bb
index c8160ca14e..c3d36e0fdb 100644
--- a/packages/gmp/gmp-native_4.1.2.bb
+++ b/packages/gmp/gmp-native_4.1.2.bb
@@ -5,3 +5,19 @@ S = "${WORKDIR}/gmp-${PV}"
 
 inherit native
 
+# darwin 'hacks'
+EXTRA_OECONF_build-darwin = " --enable-shared "
+OLD_STAGING := "${STAGING_BINDIR}"
+OLD_TARGET  := "${TARGET_SYS}"
+OLD_HOST    := "${HOST_SYS}"
+OLD_BUILD   := "${BUILD_SYS}"
+
+PATH_prepend_build-darwin = "${OLD_STAGING}/${OLD_HOST}:${OLD_STAGING}:"
+
+TARGET_SYS_build-darwin   = "none-apple-darwin"
+HOST_SYS_build-darwin     = "none-apple-darwin"
+BUILD_SYS_build-darwin    = "none-apple-darwin"
+
+do_compile_append_build-darwin() {
+    oe_runmake check
+}
-- 
cgit v1.2.3


From 690e9e12869eb453929481ec5f999bff1e36c9b3 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 6 Aug 2006 15:58:51 +0000
Subject: packages/*/*.bb: Stop GNUism on cp. -d -> -P, -a -> pPR...     Fix
 GNUism on the usage of cp     -d as --no-derefence -> -P     --deference     
     -> -L     -r                   -> -R     -a same as -dpR      -> -PpR

---
 packages/freedroid/freedroid_1.0.2.bb              |  2 +-
 packages/gdal/gdal_1.3.2.bb                        |  2 +-
 packages/gdb/gdb-cross_6.3.bb                      |  2 +-
 packages/gpe-themes/gpe-theme-clearlooks_0.2.bb    |  2 +-
 packages/gpe-themes/gpe-theme-clearlooks_0.3.bb    |  2 +-
 packages/ixp4xx/ixp-osal_1.5.bb                    |  4 ++--
 packages/ixp4xx/ixp-osal_2.0.bb                    |  4 ++--
 packages/ixp4xx/ixp-osal_2.1.1.bb                  |  4 ++--
 packages/ixp4xx/ixp-osal_2.1.bb                    |  4 ++--
 packages/ixp4xx/ixp4xx-csr_1.4.bb                  |  2 +-
 packages/libcgicc/libcgicc_3.2.3.bb                |  2 +-
 packages/mesa/mesa_6.0.1.bb                        |  8 ++++----
 packages/mesa/mesa_6.4.1+cvs20060101.bb            |  8 ++++----
 packages/mozilla/minimo_cvs.bb                     |  2 +-
 packages/nvidia-drivers/nvidia-display_1.0-8756.bb |  4 ++--
 packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb  |  2 +-
 packages/python/python-pyqt4_4.0.bb                |  2 +-
 packages/qmake/qmake-native_1.07a.bb               |  2 +-
 packages/qmake/qmake2-native_2.00a.bb              |  2 +-
 packages/slutils/slutils_0.1.0.bb                  |  2 +-
 packages/txdrug/txdrug_0.1.bb                      |  2 +-
 packages/wxbase/wxbase_2.6.2.bb                    | 10 +++++-----
 packages/wxbase/wxbase_2.7+cvs.bb                  | 10 +++++-----
 packages/xqt2/xqt2_20060509.bb                     |  2 +-
 24 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/packages/freedroid/freedroid_1.0.2.bb b/packages/freedroid/freedroid_1.0.2.bb
index be1087d691..f246bf633b 100644
--- a/packages/freedroid/freedroid_1.0.2.bb
+++ b/packages/freedroid/freedroid_1.0.2.bb
@@ -21,5 +21,5 @@ do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 src/freedroid ${D}${bindir}
         install -d ${D}${datadir}/freedroid/
-	cp -a graphics map sound ${D}${datadir}/freedroid/
+	cp -pPR graphics map sound ${D}${datadir}/freedroid/
 }
diff --git a/packages/gdal/gdal_1.3.2.bb b/packages/gdal/gdal_1.3.2.bb
index c445cd1274..70f435603c 100644
--- a/packages/gdal/gdal_1.3.2.bb
+++ b/packages/gdal/gdal_1.3.2.bb
@@ -33,6 +33,6 @@ do_compile() {
 
 do_package_prepend() {
 	# the brokenness....
-	os.system('cp -a ${D}${D}* ${D}../')
+	os.system('cp -pPR ${D}${D}* ${D}../')
 }	
 
diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb
index 1029f7bfe0..601f4a0750 100644
--- a/packages/gdb/gdb-cross_6.3.bb
+++ b/packages/gdb/gdb-cross_6.3.bb
@@ -33,6 +33,6 @@ do_configure () {
 
 do_stage() {
 	oe_runmake 'DESTDIR=${CROSS_DIR}' install
-	cp -a ${CROSS_DIR}${prefix}/* ${CROSS_DIR}
+	cp -pPR ${CROSS_DIR}${prefix}/* ${CROSS_DIR}
 	rm -rf ${CROSS_DIR}${prefix}
 }
diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
index dc8f434ecc..4634b1b575 100644
--- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
+++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
@@ -13,7 +13,7 @@ SRC_URI =		"http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
-cp -dpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ 
+cp -PpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ 
 }
 
 
diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
index 599abee8b4..5cedd57e9c 100644
--- a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
+++ b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
@@ -13,7 +13,7 @@ SRC_URI =		"http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
-cp -dpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ 
+cp -PpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ 
 }
 
 
diff --git a/packages/ixp4xx/ixp-osal_1.5.bb b/packages/ixp4xx/ixp-osal_1.5.bb
index 66cf9e6b06..bfb76a3fc6 100644
--- a/packages/ixp4xx/ixp-osal_1.5.bb
+++ b/packages/ixp4xx/ixp-osal_1.5.bb
@@ -51,9 +51,9 @@ do_stage () {
 
 	# First the include files, maintain the tree structure (ixp4xx-csr
 	# expects the exact same tree)
-	cp -rf --dereference include ${OSAL_DIR}
+	cp -RLf include ${OSAL_DIR}
 	install -d ${OSAL_DIR}/os/linux
-	cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux
+	cp -RLf os/linux/include ${OSAL_DIR}/os/linux
 
 	# Install the library/object
 	install -d ${OSAL_DIR}/${OSAL_PATH}
diff --git a/packages/ixp4xx/ixp-osal_2.0.bb b/packages/ixp4xx/ixp-osal_2.0.bb
index 84929d5cb5..4ca2543156 100644
--- a/packages/ixp4xx/ixp-osal_2.0.bb
+++ b/packages/ixp4xx/ixp-osal_2.0.bb
@@ -61,9 +61,9 @@ do_stage () {
 
 	# First the include files, maintain the tree structure (ixp4xx-csr
 	# expects the exact same tree)
-	cp -rf --dereference include ${OSAL_DIR}
+	cp -RLf include ${OSAL_DIR}
 	install -d ${OSAL_DIR}/os/linux
-	cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux
+	cp -RLf os/linux/include ${OSAL_DIR}/os/linux
 
 	# Install the library/object
 	install -d ${OSAL_DIR}/${OSAL_PATH}
diff --git a/packages/ixp4xx/ixp-osal_2.1.1.bb b/packages/ixp4xx/ixp-osal_2.1.1.bb
index 926d720f3a..02206fb3cf 100644
--- a/packages/ixp4xx/ixp-osal_2.1.1.bb
+++ b/packages/ixp4xx/ixp-osal_2.1.1.bb
@@ -80,9 +80,9 @@ do_stage () {
 
 	# First the include files, maintain the tree structure (ixp4xx-csr
 	# expects the exact same tree)
-	cp -rf --dereference include ${OSAL_DIR}
+	cp -RLf include ${OSAL_DIR}
 	install -d ${OSAL_DIR}/os/linux
-	cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux
+	cp -RLf os/linux/include ${OSAL_DIR}/os/linux
 
 	# Install the library/object
 	install -d ${OSAL_DIR}/${OSAL_PATH}
diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb
index 0e5531a254..b020c9dafd 100644
--- a/packages/ixp4xx/ixp-osal_2.1.bb
+++ b/packages/ixp4xx/ixp-osal_2.1.bb
@@ -68,9 +68,9 @@ do_stage () {
 
 	# First the include files, maintain the tree structure (ixp4xx-csr
 	# expects the exact same tree)
-	cp -rf --dereference include ${OSAL_DIR}
+	cp -RLf include ${OSAL_DIR}
 	install -d ${OSAL_DIR}/os/linux
-	cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux
+	cp -RLf os/linux/include ${OSAL_DIR}/os/linux
 
 	# Install the library/object
 	install -d ${OSAL_DIR}/${OSAL_PATH}
diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb
index 7146d9e402..286ecf957a 100644
--- a/packages/ixp4xx/ixp4xx-csr_1.4.bb
+++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb
@@ -54,7 +54,7 @@ do_compile () {
 do_stage () {
 	install -d ${STAGING_INCDIR}/linux/ixp4xx-csr
 	install -m 0644 src/include/*.h ${STAGING_INCDIR}/linux/ixp4xx-csr/
-	cp -rf --dereference src/linux/* ${STAGING_INCDIR}/linux/ixp4xx-csr/
+	cp -RLf src/linux/* ${STAGING_INCDIR}/linux/ixp4xx-csr/
 }
 
 do_install () {
diff --git a/packages/libcgicc/libcgicc_3.2.3.bb b/packages/libcgicc/libcgicc_3.2.3.bb
index 5e9c9acff1..adf5108c12 100644
--- a/packages/libcgicc/libcgicc_3.2.3.bb
+++ b/packages/libcgicc/libcgicc_3.2.3.bb
@@ -10,6 +10,6 @@ inherit autotools
 
 do_stage () {
 	install -d ${STAGING_INCDIR}/cgicc
-	cp --dereference -R cgicc/*.h ${STAGING_INCDIR}/cgicc
+	cp -LR cgicc/*.h ${STAGING_INCDIR}/cgicc
 	oe_libinstall -C cgicc libcgicc ${STAGING_LIBDIR}
 }
diff --git a/packages/mesa/mesa_6.0.1.bb b/packages/mesa/mesa_6.0.1.bb
index be63a32190..d8c857fef7 100644
--- a/packages/mesa/mesa_6.0.1.bb
+++ b/packages/mesa/mesa_6.0.1.bb
@@ -14,12 +14,12 @@ do_compile() {
 
 do_install() {
 	install -d ${D}${libdir}
-	cp -pd lib/* ${D}${libdir}/
+	cp -pP lib/* ${D}${libdir}/
 	install -d ${D}${includedir}
-	cp -r include/GL ${D}${includedir}/
+	cp -R include/GL ${D}${includedir}/
 }
 
 do_stage() {
-        cp -pd lib/* ${STAGING_LIBDIR}/
-        cp -r include/GL ${STAGING_INCDIR}/
+        cp -pP lib/* ${STAGING_LIBDIR}/
+        cp -R include/GL ${STAGING_INCDIR}/
 }
diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb
index c39dc02d97..aca9331e00 100644
--- a/packages/mesa/mesa_6.4.1+cvs20060101.bb
+++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb
@@ -34,12 +34,12 @@ do_compile() {
 
 do_install() {
 	install -d ${D}${libdir}
-	cp -pd lib/* ${D}${libdir}/
+	cp -pP lib/* ${D}${libdir}/
 	install -d ${D}${includedir}
-	cp -r include/GL ${D}${includedir}/
+	cp -R include/GL ${D}${includedir}/
 }
 
 do_stage() {
-        cp -pd lib/* ${STAGING_LIBDIR}/
-        cp -r include/GL ${STAGING_INCDIR}/
+        cp -pP lib/* ${STAGING_LIBDIR}/
+        cp -R include/GL ${STAGING_INCDIR}/
 }
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 293e6b2a3e..93cdc856d1 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -34,7 +34,7 @@ do_install () {
 	oe_runmake package
 	cd ${S}
 	mkdir -p ${mozdir}
-	cp -rL $MOZ_OBJDIR/dist/minimo/* ${mozdir}/
+	cp -RL $MOZ_OBJDIR/dist/minimo/* ${mozdir}/
 	mkdir -p ${D}${datadir}/applications
 	install -m 0644 ${WORKDIR}/minimo.desktop ${D}${datadir}/applications/minimo.desktop
 	mkdir -p ${D}${datadir}/pixmaps
diff --git a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb b/packages/nvidia-drivers/nvidia-display_1.0-8756.bb
index 12df834298..dd83eec800 100644
--- a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb
+++ b/packages/nvidia-drivers/nvidia-display_1.0-8756.bb
@@ -30,13 +30,13 @@ do_install() {
 
 	install -d ${D}/usr
 	for dir in bin include lib share ; do
-		cp -a ${WORKDIR}/${PKG_BASENAME}/usr/$dir ${D}/usr/
+		cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/$dir ${D}/usr/
 	done
 	
 	#X11R7.0 style...
 	install -d ${D}/usr/lib/xorg/
 	cp ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/lib* ${D}/usr/lib/
-	cp -a ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/modules ${D}/usr/lib/xorg/
+	cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/modules ${D}/usr/lib/xorg/
 	ln -s libglx.so.1.0.8756 ${D}/usr/lib/xorg/modules/extensions/libglx.so
 	
 }
diff --git a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb b/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb
index eb9bc228a1..42b928f38a 100644
--- a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb
+++ b/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb
@@ -59,7 +59,7 @@ do_install() {
 
 	install -d ${D}/usr
 	for dir in usr/bin nvsound/lib ; do
-		cp -a ${S}/$dir ${D}/usr/
+		cp -pPR ${S}/$dir ${D}/usr/
 	done
 	
 }
diff --git a/packages/python/python-pyqt4_4.0.bb b/packages/python/python-pyqt4_4.0.bb
index 6cd91e68ec..7550e2314d 100644
--- a/packages/python/python-pyqt4_4.0.bb
+++ b/packages/python/python-pyqt4_4.0.bb
@@ -63,7 +63,7 @@ do_install() {
 		echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py
 		install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so
     done
-	cp -a elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
+	cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
 	cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
 }
 
diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb
index 0b8c3e84ec..2a4408ad2a 100644
--- a/packages/qmake/qmake-native_1.07a.bb
+++ b/packages/qmake/qmake-native_1.07a.bb
@@ -39,7 +39,7 @@ do_compile() {
 do_stage() {
 	install -m 0755 bin/qmake ${STAGING_BINDIR}
 	install -d ${QMAKE_MKSPEC_PATH}
-	cp -dfR mkspecs/* ${QMAKE_MKSPEC_PATH}
+	cp -fPR mkspecs/* ${QMAKE_MKSPEC_PATH}
 }
 
 do_install() {
diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb
index 744588ed27..9f1af8fef2 100644
--- a/packages/qmake/qmake2-native_2.00a.bb
+++ b/packages/qmake/qmake2-native_2.00a.bb
@@ -42,7 +42,7 @@ do_compile() {
 do_stage() {
 	install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2
 	install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/
-	cp -dfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
+	cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
 }
 
 do_install() {
diff --git a/packages/slutils/slutils_0.1.0.bb b/packages/slutils/slutils_0.1.0.bb
index 958fab46d5..cdb2996986 100644
--- a/packages/slutils/slutils_0.1.0.bb
+++ b/packages/slutils/slutils_0.1.0.bb
@@ -21,7 +21,7 @@ do_fetch() {
 	for u in ${UTILS}
 	do
 		install -d ${S}/$u
-		cp -dfR `ls -dp ${FILESDIR}/$u/*|grep -v SCCS` ${S}/$u/
+		cp -PfR `ls -dp ${FILESDIR}/$u/*|grep -v SCCS` ${S}/$u/
 	done
 }
 
diff --git a/packages/txdrug/txdrug_0.1.bb b/packages/txdrug/txdrug_0.1.bb
index fd12180ac6..121dfdbad3 100644
--- a/packages/txdrug/txdrug_0.1.bb
+++ b/packages/txdrug/txdrug_0.1.bb
@@ -20,6 +20,6 @@ do_configure_prepend() {
 
 do_install() {
         install -d ${D}${palmtopdir}
-	cp -dfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/
+	cp -Pfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/
         install -D -m 755 txdrug ${D}${palmtopdir}/bin/txdrug
 }
diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxbase/wxbase_2.6.2.bb
index 2a41fdfa65..748d738c1c 100644
--- a/packages/wxbase/wxbase_2.6.2.bb
+++ b/packages/wxbase/wxbase_2.6.2.bb
@@ -23,11 +23,11 @@ do_configure() {
 
 do_stage() {
        install -d ${STAGING_INCDIR}/wx-2.6/wx
-       cp -pr include/wx ${STAGING_INCDIR}/wx-2.6	
-       cp -pr lib/libwx* ${STAGING_LIBDIR}
-       cp -pr lib/wx     ${STAGING_LIBDIR}
-       cp -pr build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
-       cp -pr wxwin.m4                           ${STAGING_DATADIR}/aclocal		
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.6	
+       cp -pR lib/libwx* ${STAGING_LIBDIR}
+       cp -pR lib/wx     ${STAGING_LIBDIR}
+       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal		
        ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR}/wx-config
        sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
            -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb
index efc04b6f8c..a813788eee 100644
--- a/packages/wxbase/wxbase_2.7+cvs.bb
+++ b/packages/wxbase/wxbase_2.7+cvs.bb
@@ -24,11 +24,11 @@ do_configure() {
 
 do_stage() {
        install -d ${STAGING_INCDIR}/wx-2.7/wx
-       cp -pr include/wx ${STAGING_INCDIR}/wx-2.7	
-       cp -pr lib/libwx* ${STAGING_LIBDIR}
-       cp -pr lib/wx     ${STAGING_LIBDIR}
-       cp -pr build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
-       cp -pr wxwin.m4                           ${STAGING_DATADIR}/aclocal
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.7	
+       cp -pR lib/libwx* ${STAGING_LIBDIR}
+       cp -pR lib/wx     ${STAGING_LIBDIR}
+       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
        ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR}/wx-config
        sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
            -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb
index 1b294475a4..cde82c3f4a 100644
--- a/packages/xqt2/xqt2_20060509.bb
+++ b/packages/xqt2/xqt2_20060509.bb
@@ -75,7 +75,7 @@ do_configure() {
 do_compile() {
     export TOPDIR=${TOPDIR}
     mkdir -p programs/Xserver/hw/xqt
-    #cp -r ../xqt-driver/* programs/Xserver/hw/xqt
+    #cp -R ../xqt-driver/* programs/Xserver/hw/xqt
     (cd programs/Xserver/hw/xqt && ln -s ../../../../../xqt2/xfree86/xqt-driver/* .)
 	unset CC
 	make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
-- 
cgit v1.2.3


From ccec27323e3f552fcd1af2ff90fe099be0c88401 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 6 Aug 2006 19:37:22 +0000
Subject: clases/cpan.bbclass,packages/perl: add EXTRA_CPANFLAGS, fix native   
  Add EXTRA_CPANFLAGS to cpan.bbclass, similiar to EXTRA_OECONF     and
 EXTRA_OEMAKE     Use this in libxml-parser-perl-native to point to the expat 
    include and libraries     perl-native inherits native already. No need to
 use BUILD_CC,     BUILD_FOO, BUILD_LDFLAGS but use LDFLAGS and CC directly.
 LDFLAGS     has rpath already removed...

---
 classes/cpan.bbclass                            | 3 ++-
 packages/perl/libxml-parser-perl-native_2.34.bb | 1 +
 packages/perl/perl-native_5.8.4.bb              | 6 +++---
 packages/perl/perl-native_5.8.7.bb              | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 853abfd1b3..78b902f85d 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -1,7 +1,8 @@
 FILES_${PN} += '${libdir}/perl5'
+EXTRA_CPANFLAGS = ""
 
 cpan_do_configure () {
-	perl Makefile.PL
+	perl Makefile.PL ${EXTRA_CPANFLAGS}
 	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
 		. ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
 		sed -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:; s:\(SITEARCHEXP = \).*:\1${sitearchexp}:; s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" < Makefile > Makefile.new
diff --git a/packages/perl/libxml-parser-perl-native_2.34.bb b/packages/perl/libxml-parser-perl-native_2.34.bb
index 12bb476caa..55bae665b5 100644
--- a/packages/perl/libxml-parser-perl-native_2.34.bb
+++ b/packages/perl/libxml-parser-perl-native_2.34.bb
@@ -2,3 +2,4 @@ SECTION = "libs"
 require libxml-parser-perl_${PV}.bb
 inherit native
 DEPENDS = "perl-native expat-native"
+EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
diff --git a/packages/perl/perl-native_5.8.4.bb b/packages/perl/perl-native_5.8.4.bb
index a4065e999b..4ec0c0f494 100644
--- a/packages/perl/perl-native_5.8.4.bb
+++ b/packages/perl/perl-native_5.8.4.bb
@@ -13,9 +13,9 @@ S = "${WORKDIR}/perl-${PV}"
 
 do_configure () {
     ./Configure					\
-    -Dcc="${BUILD_CC}"				\
-    -Dcflags="${BUILD_CFLAGS}"			\
-    -Dldflags="${BUILD_LDFLAGS} -Wl,-rpath,${STAGING_LIBDIR}"		\
+    -Dcc="${CC}"				\
+    -Dcflags="${CFLAGS}"			\
+    -Dldflags="${LDFLAGS}"		\
     -Dusethreads				\
     -Duselargefiles				\
     -Dprefix=${prefix}				\
diff --git a/packages/perl/perl-native_5.8.7.bb b/packages/perl/perl-native_5.8.7.bb
index 170a0ebf8d..ebe6ac9507 100644
--- a/packages/perl/perl-native_5.8.7.bb
+++ b/packages/perl/perl-native_5.8.7.bb
@@ -18,9 +18,9 @@ PARALLEL_MAKE = ""
 
 do_configure () {
     ./Configure					\
-    -Dcc="${BUILD_CC}"				\
-    -Dcflags="${BUILD_CFLAGS}"			\
-    -Dldflags="${BUILD_LDFLAGS} -Wl,-rpath,${STAGING_LIBDIR}"		\
+    -Dcc="${CC}"				\
+    -Dcflags="${CFLAGS}"			\
+    -Dldflags="$LDFLAGS}"		\
     -Dusethreads				\
     -Duselargefiles				\
     -Dprefix=${prefix}				\
-- 
cgit v1.2.3


From 4f808eb2f1265e33852fb926fe74d04ba9d27b9a Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 6 Aug 2006 19:45:08 +0000
Subject: packaes/zlib: Do not use uname to determine the library ending     Do
 not use uname to decide if the library ends with dylib     or so. And where
 to put the Version numbers...     For darwin unset LDSHARED as we do not have
 gcc -shared to     zlib should use autofoo to decide such things...

---
 packages/zlib/zlib-1.2.3/sane-target.patch | 38 ++++++++++++++++++++++++++++++
 packages/zlib/zlib-native_1.2.3.bb         | 10 ++++++++
 packages/zlib/zlib_1.2.3.bb                | 11 ++++++---
 3 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 packages/zlib/zlib-1.2.3/sane-target.patch

diff --git a/packages/zlib/zlib-1.2.3/sane-target.patch b/packages/zlib/zlib-1.2.3/sane-target.patch
new file mode 100644
index 0000000000..bacdd031af
--- /dev/null
+++ b/packages/zlib/zlib-1.2.3/sane-target.patch
@@ -0,0 +1,38 @@
+Index: zlib-1.2.3/configure
+===================================================================
+--- zlib-1.2.3.orig/configure	2005-07-11 22:11:57.000000000 +0200
++++ zlib-1.2.3/configure	2006-08-06 20:22:47.000000000 +0200
+@@ -35,6 +35,7 @@
+ gcc=0
+ old_cc="$CC"
+ old_cflags="$CFLAGS"
++target=`(uname -s || echo unknown) 2>/dev/null`
+ 
+ while test $# -ge 1
+ do
+@@ -42,7 +43,7 @@
+     -h* | --h*)
+       echo 'usage:'
+       echo '  configure [--shared] [--prefix=PREFIX]  [--exec_prefix=EXPREFIX]'
+-      echo '     [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'
++      echo '     [--libdir=LIBDIR] [--includedir=INCLUDEDIR] [--target=TARGET]'
+         exit 0;;
+     -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+     -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+@@ -53,6 +54,7 @@
+     -l* | --l*) libdir="$2"; shift; shift;;
+     -i* | --i*) includedir="$2"; shift; shift;;
+     -s* | --s*) shared=1; shift;;
++    --target=*) target=`echo $1 | sed 's/[-a-z_]*=//'`;shift;;
+     *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;;
+     esac
+ done
+@@ -75,7 +77,7 @@
+   CC="$cc"
+   SFLAGS=${CFLAGS-"-fPIC -O3"}
+   CFLAGS="$cflags"
+-  case `(uname -s || echo unknown) 2>/dev/null` in
++  case $target in
+   Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
+   CYGWIN* | Cygwin* | cygwin* | OS/2* )
+              EXE='.exe';;
diff --git a/packages/zlib/zlib-native_1.2.3.bb b/packages/zlib/zlib-native_1.2.3.bb
index c568358694..c7defb6aac 100644
--- a/packages/zlib/zlib-native_1.2.3.bb
+++ b/packages/zlib/zlib-native_1.2.3.bb
@@ -1,6 +1,16 @@
 SECTION = "libs"
 require zlib_${PV}.bb
+ZLIB_EXTRA = ""
 inherit native
 
 DEPENDS = "libtool-native"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/zlib-${PV}', '${FILE_DIRNAME}/zlib', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+
+# darwin hacks
+ZLIB_SHARED_build-darwin ="libz.1.2.3.dylib"
+do_compile_build-darwin() {
+    unset LDSHARED
+    ./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
+    oe_runmake
+}
diff --git a/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb
index c7a72c9107..8a48a89fdf 100644
--- a/packages/zlib/zlib_1.2.3.bb
+++ b/packages/zlib/zlib_1.2.3.bb
@@ -7,7 +7,8 @@ LICENSE = "zlib"
 
 SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
 		file://visibility.patch;patch=1 \
-		file://libtool_staging.patch;patch=1"
+		file://libtool_staging.patch;patch=1 \
+		file://sane-target.patch;patch=1 "
 
 S = "${WORKDIR}/zlib-${PV}"
 
@@ -19,9 +20,13 @@ CFLAGS_prepend = "-fPIC -DZLIB_DLL "
 AR_append = " rc"
 EXTRA_OEMAKE = " LIBTOOL=${TARGET_SYS}-libtool"
 
+# extra configure options, can be reset in the -native variant
+ZLIB_EXTRA = "--target=${TARGET_OS}"
+ZLIB_SHARED= "libz.so.${PV}"
+
 do_compile() {
-	./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
-	oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a
+	./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir} ${ZLIB_EXTRA}
+	oe_runmake -e MAKEFLAGS="" ${ZLIB_SHARED} libz.a
 }
 
 do_stage() {
-- 
cgit v1.2.3


From deaa64e8bdcde263143ff6013c05faa76018c657 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Sun, 6 Aug 2006 20:20:26 +0000
Subject: packages/freetype: fix build without internal libz Some user reports
 that building freetype without the included libz breaks there build. They are
 right. Justify the remaining freetype.bb like freetype_2.2.1.bb

---
 packages/freetype/freetype_2.1.10.bb | 1 +
 packages/freetype/freetype_2.1.8.bb  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/freetype/freetype_2.1.10.bb b/packages/freetype/freetype_2.1.10.bb
index 35c0d0cbd6..532d9d083c 100644
--- a/packages/freetype/freetype_2.1.10.bb
+++ b/packages/freetype/freetype_2.1.10.bb
@@ -13,6 +13,7 @@ inherit autotools pkgconfig binconfig
 
 LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
+EXTRA_OECONF = "--without-zlib"
 
 do_configure() {
 	cd builds/unix
diff --git a/packages/freetype/freetype_2.1.8.bb b/packages/freetype/freetype_2.1.8.bb
index 5e9db480ea..49770277b9 100644
--- a/packages/freetype/freetype_2.1.8.bb
+++ b/packages/freetype/freetype_2.1.8.bb
@@ -11,6 +11,7 @@ inherit autotools pkgconfig binconfig
 
 LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOO