From 44b1ddb504535400e1272d5d9259778249f36b47 Mon Sep 17 00:00:00 2001 From: Holger Freyther 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 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 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 <&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 <&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 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