From 8979ceed2e9ed94a2022a1c760bdec38e16e05d0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz 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 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 " + +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 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 +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 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 From 690e9e12869eb453929481ec5f999bff1e36c9b3 Mon Sep 17 00:00:00 2001 From: Holger Freyther 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 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 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 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=${LIBTOOL}'" +EXTRA_OECONF = "--without-zlib" do_configure() { cd builds/unix -- cgit v1.2.3 From e2a0d680182fdbc6cb56c8f77b9e85da82d63ede Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 6 Aug 2006 21:26:10 +0000 Subject: packages/quilt: Fix build of quilt 0.45 The aclocal.m4 is an automatically generated file, created by aclocal.m4. The OpenEmbedded project automatially removes this automatically generated file to regenerate it using aclocal. Readd the content from aclocal.m4 as acinclude.m4 which will be seen by the same set of programs... Or as the automake website says: "The contents of `acinclude.m4', if it exists, are also automatically included in `aclocal.m4'. This is useful for incorporating local macros into `configure'." --- packages/quilt/quilt-0.45/aclocal.patch | 71 +++++++++++++++++++++++++++++++++ packages/quilt/quilt_0.45.bb | 2 + 2 files changed, 73 insertions(+) create mode 100644 packages/quilt/quilt-0.45/aclocal.patch diff --git a/packages/quilt/quilt-0.45/aclocal.patch b/packages/quilt/quilt-0.45/aclocal.patch new file mode 100644 index 0000000000..03d99ed785 --- /dev/null +++ b/packages/quilt/quilt-0.45/aclocal.patch @@ -0,0 +1,71 @@ +Add the aclocal.m4 as acinclude.m4 + +Index: quilt-0.45/acinclude.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ quilt-0.45/acinclude.m4 2006-08-06 23:18:56.000000000 +0200 +@@ -0,0 +1,64 @@ ++dnl Allow configure to specify a specific binary ++dnl 1: Environment variable ++dnl 2: binary name ++dnl 3: optional list of alternative binary names ++dnl 4: optional list of additional search directories ++AC_DEFUN([QUILT_COMPAT_PROG_PATH],[ ++ m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in 2>/dev/null)]) ++ ++ AC_ARG_WITH($2, AC_HELP_STRING( ++ [--with-$2], [name of the $2 executable to use] ++ m4_if(internal_$2_cmd,[],[],[ (use --without-$2 ++ to use an internal mechanism)])), ++ [ ++ if test x"$withval" = xnone; then ++ AC_MSG_ERROR([Invalid configure argument. use --without-$2]) ++ fi ++ if test x"$withval" != xno; then ++ AC_MSG_CHECKING(for $2) ++ $1="$withval" ++ if test -e "$$1"; then ++ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then ++ AC_MSG_ERROR([$$1 is not an executable file]) ++ fi ++ fi ++ AC_MSG_RESULT([$$1]) ++ if test ! -e "$$1"; then ++ AC_MSG_WARN([$$1 does not exist]) ++ fi ++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" ++ fi ++ ],[ ++ m4_if([$3],[],[ ++ AC_PATH_PROG($1,$2,,$PATH:$4) ++ ],[ ++ AC_PATH_PROGS($1,$3,,$PATH:$4) ++ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then ++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" ++ fi ++ ]) ++ m4_if([$4],[],[],[ ++ if test -n "$$1"; then ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ for dir in "$4"; do ++ if test "`dirname $$1`" = "$dir"; then ++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" ++ break ++ fi ++ done ++ IFS="$as_save_IFS" ++ fi ++ ]) ++ ]) ++ if test -z "$$1"; then ++ m4_if(internal_$2_cmd,[],[ ++ AC_MSG_ERROR([Please specify the location of $2 with the option '--with-$2']) ++ ],[ ++ AC_MSG_WARN([Using internal $2 mechanism. Use option '--with-$2' to override]) ++ COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2" ++ $1=$2 ++ INTERNAL_$1=1 ++ ]) ++ fi ++ AC_SUBST($1) ++]) diff --git a/packages/quilt/quilt_0.45.bb b/packages/quilt/quilt_0.45.bb index 9a08b19abd..cf96cc9bc9 100644 --- a/packages/quilt/quilt_0.45.bb +++ b/packages/quilt/quilt_0.45.bb @@ -2,6 +2,8 @@ RDEPENDS_${PN} += "patch diffstat bzip2" require quilt_${PV}.inc +SRC_URI += "file://aclocal.patch;patch=1" + inherit autotools gettext require quilt-package.inc -- cgit v1.2.3 From 94e5d83684cdb28a67b702181458b4598545af53 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 Aug 2006 08:28:11 +0000 Subject: handhelds-pxa-2.6: add patch to enable iwmmxt for the hx4700 * tested using DISTRO=angstrom-2006.9: root@ipaq-pxa270:~$ ./iwmmx-test before: 10203045060708 10203045060708 after: 2040608a0c0e10 --- packages/linux/handhelds-pxa-2.6/hx-iwmmxt.patch | 15 +++++++++++++++ packages/linux/handhelds-pxa-2.6_cvs.bb | 7 ++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 packages/linux/handhelds-pxa-2.6/hx-iwmmxt.patch diff --git a/packages/linux/handhelds-pxa-2.6/hx-iwmmxt.patch b/packages/linux/handhelds-pxa-2.6/hx-iwmmxt.patch new file mode 100644 index 0000000000..2cb7b37da7 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.6/hx-iwmmxt.patch @@ -0,0 +1,15 @@ +Index: kernel26/arch/arm/mach-pxa/hx4700/Kconfig +=================================================================== +RCS file: /cvs/linux/kernel26/arch/arm/mach-pxa/hx4700/Kconfig,v +retrieving revision 1.22 +diff -u -r1.22 Kconfig +--- kernel26/arch/arm/mach-pxa/hx4700/Kconfig 28 Mar 2006 19:12:12 -0000 1.22 ++++ kernel26/arch/arm/mach-pxa/hx4700/Kconfig 6 Aug 2006 23:24:52 -0000 +@@ -2,6 +2,7 @@ + bool "HP iPAQ hx4700" + select PXA27x + select GPIO_KEYS ++ select IWMMXT + help + This enables support for the HP iPAQ hx4700 handheld. + diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index 054868864f..0273f1b911 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -3,17 +3,18 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." MAINTAINER = "Greg Gilbert " LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -PR = "r0" +PR = "r1" # COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' +COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://24-hostap_cs_id.diff;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ - file://defconfig" + file://hx-iwmmxt.patch;patch=1 \ + file://defconfig" S = "${WORKDIR}/kernel26" -- cgit v1.2.3 From 578337a073332bac0da58ce23ded325ae294b035 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 Aug 2006 10:24:15 +0000 Subject: ipaq-pxa270.conf: make iwmmxt a higher priority as armv5te --- conf/machine/ipaq-pxa270.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index f509cd0a5d..fa3675fb59 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv4t iwmmxt armv5te ipaqpxa hx4700" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700" #use this for a hx47xx ipaq PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" @@ -37,10 +37,10 @@ include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.conf +#include conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#include conf/machine/include/tune-iwmmxt.conf +include conf/machine/include/tune-iwmmxt.conf # These modules are now compiled into the kernel: -- cgit v1.2.3 From 9a43dec5f55e85b35dc7ddb46bf0080ca9d67a31 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 7 Aug 2006 11:08:48 +0000 Subject: gpe-contacts: drop my version --- packages/gpe-contacts/gpe-contacts_0.46.bb | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 packages/gpe-contacts/gpe-contacts_0.46.bb diff --git a/packages/gpe-contacts/gpe-contacts_0.46.bb b/packages/gpe-contacts/gpe-contacts_0.46.bb deleted file mode 100644 index 879a4bf691..0000000000 --- a/packages/gpe-contacts/gpe-contacts_0.46.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPL" -MAINTAINER = "Florian Boor -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 af5f0bd309b34453fcc397c05ed34c33f53f33ef Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 7 Aug 2006 11:09:54 +0000 Subject: libcontactsdb: drop my version --- packages/libcontactsdb/libcontactsdb_0.5.bb | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 packages/libcontactsdb/libcontactsdb_0.5.bb diff --git a/packages/libcontactsdb/libcontactsdb_0.5.bb b/packages/libcontactsdb/libcontactsdb_0.5.bb deleted file mode 100644 index 93950a3e1c..0000000000 --- a/packages/libcontactsdb/libcontactsdb_0.5.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "LGPL" -DESCRIPTION = "Database access library for GPE contacts" -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libgpewidget libgpepimc sqlite" -MAINTAINER = "Florian Boor " - -PR = "r0" -GPE_TARBALL_SUFFIX = "bz2" - -inherit autotools gpe pkgconfig - -do_stage () { -autotools_stage_all -} -- cgit v1.2.3 From 4f182b393d87e8095cf81c8df8e298441473c53c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 Aug 2006 12:38:53 +0000 Subject: openssh: add 4.3p2 --- packages/openssh/openssh-4.3p2/.mtn2git_empty | 0 packages/openssh/openssh-4.3p2/ssh_config | 38 +++++++++ packages/openssh/openssh-4.3p2/sshd_config | 96 +++++++++++++++++++++++ packages/openssh/openssh_4.3p2.bb | 108 ++++++++++++++++++++++++++ 4 files changed, 242 insertions(+) create mode 100644 packages/openssh/openssh-4.3p2/.mtn2git_empty create mode 100644 packages/openssh/openssh-4.3p2/ssh_config create mode 100644 packages/openssh/openssh-4.3p2/sshd_config create mode 100644 packages/openssh/openssh_4.3p2.bb diff --git a/packages/openssh/openssh-4.3p2/.mtn2git_empty b/packages/openssh/openssh-4.3p2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openssh/openssh-4.3p2/ssh_config b/packages/openssh/openssh-4.3p2/ssh_config new file mode 100644 index 0000000000..25ca7f56bd --- /dev/null +++ b/packages/openssh/openssh-4.3p2/ssh_config @@ -0,0 +1,38 @@ +# $OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $ + +# This is the ssh client system-wide configuration file. See +# ssh_config(5) for more information. This file provides defaults for +# users, and the values can be changed in per-user configuration files +# or on the command line. + +# Configuration data is parsed as follows: +# 1. command line options +# 2. user-specific file +# 3. system-wide file +# Any configuration value is only changed the first time it is set. +# Thus, host-specific definitions should be at the beginning of the +# configuration file, and defaults at the end. + +# Site-wide defaults for various options + +# Host * +# ForwardAgent no +# ForwardX11 no +# RhostsAuthentication no +# RhostsRSAAuthentication no +# RSAAuthentication yes +# PasswordAuthentication yes +# HostbasedAuthentication no +# BatchMode no +# CheckHostIP yes +# StrictHostKeyChecking ask +# IdentityFile ~/.ssh/identity +# IdentityFile ~/.ssh/id_rsa +# IdentityFile ~/.ssh/id_dsa +# Port 22 +# Protocol 2,1 +# Cipher 3des +# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc +# EscapeChar ~ +Host * + ForwardX11 yes diff --git a/packages/openssh/openssh-4.3p2/sshd_config b/packages/openssh/openssh-4.3p2/sshd_config new file mode 100644 index 0000000000..8c1069d9a6 --- /dev/null +++ b/packages/openssh/openssh-4.3p2/sshd_config @@ -0,0 +1,96 @@ +# $OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options change a +# default value. + +#Port 22 +Protocol 2 +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 3600 +#ServerKeyBits 768 + +# Logging +#obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 120 +#PermitRootLogin yes +#StrictModes yes + +#RSAAuthentication yes +#PubkeyAuthentication yes +#AuthorizedKeysFile .ssh/authorized_keys + +# rhosts authentication should not be used +#RhostsAuthentication no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes + +#AFSTokenPassing no + +# Kerberos TGT Passing only works with the AFS kaserver +#KerberosTgtPassing no + +# Set this to 'yes' to enable PAM keyboard-interactive authentication +# Warning: enabling this may bypass the setting of 'PasswordAuthentication' +#PAMAuthenticationViaKbdInt no + +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#KeepAlive yes +#UseLogin no +UsePrivilegeSeparation yes +#PermitUserEnvironment no +Compression no + +#MaxStartups 10 +# no default banner path +#Banner /some/path +#VerifyReverseMapping no + +ClientAliveInterval 15 +ClientAliveCountMax 4 + +# override default of no subsystems +Subsystem sftp /usr/libexec/sftp-server diff --git a/packages/openssh/openssh_4.3p2.bb b/packages/openssh/openssh_4.3p2.bb new file mode 100644 index 0000000000..e696c69ecb --- /dev/null +++ b/packages/openssh/openssh_4.3p2.bb @@ -0,0 +1,108 @@ +DEPENDS = "zlib openssl" + +RCONFLICTS_openssh = "dropbear" +RCONFLICTS_openssh-sshd = "dropbear" + +SECTION = "console/network" +DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \ +Ssh (Secure Shell) is a program for logging into a remote machine \ +and for executing commands on a remote machine. \ +It provides secure encrypted communications between two untrusted \ +hosts over an insecure network. X11 connections and arbitrary TCP/IP \ +ports can also be forwarded over the secure channel. \ +It is intended as a replacement for rlogin, rsh and rcp, and can be \ +used to provide applications with a secure communication channel." +HOMEPAGE = "http://www.openssh.org/" +LICENSE = "BSD" +MAINTAINER = "Bruno Randolf " +PR = "r10" + +SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ + file://sshd_config \ + file://ssh_config \ + file://init" + +inherit autotools + +export ASKPASS_PROGRAM = "${bindir}/ssh-askpass" +export LD = "${CC}" +CFLAGS_prepend = "-I${S} " +CFLAGS_append = " -D__FILE_OFFSET_BITS=64" +LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat " +EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \ + --with-rand-helper=no --without-pam \ + --without-zlib-version-check \ + --with-privsep-path=/var/run/sshd \ + --sysconfdir=${sysconfdir}/ssh \ + --with-xauth=/usr/bin/xauth" + +EXTRA_OEMAKE = "'STRIP_OPT='" + +do_configure_prepend () { + if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then + cp aclocal.m4 acinclude.m4 + fi +} + +do_compile_append () { + install -m 0644 ${WORKDIR}/sshd_config ${S}/ + install -m 0644 ${WORKDIR}/ssh_config ${S}/ +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd + mv ${D}${bindir}/scp ${D}${bindir}/scp.openssh + mv ${D}${bindir}/ssh ${D}${bindir}/ssh.openssh +} + +PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc" +FILES_openssh-scp = "${bindir}/scp.${PN}" +FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" +FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen" +FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config /var/run/sshd" +FILES_openssh-sftp = "${bindir}/sftp ${libdir}exec/sftp-server" +FILES_openssh-misc = "${bindir} ${libdir}exec/" +RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd" +DEPENDS_openssh-sshd += " update-rc.d" +RDEPENDS_openssh-sshd += " update-rc.d" + +pkg_postinst_openssh-sshd() { +if test "x$D" != "x"; then + exit 1 +else + addgroup sshd + adduser --system --home /var/run/sshd --no-create-home --disabled-password --ingroup sshd -s /bin/false sshd + update-rc.d sshd defaults 9 +fi +} + +pkg_postinst_openssh-scp() { + update-alternatives --install ${bindir}/scp scp scp.${PN} 90 +} + +pkg_postinst_openssh-ssh() { + update-alternatives --install ${bindir}/ssh ssh ssh.${PN} 90 +} + +pkg_postrm_openssh-ssh() { + update-alternatives --remove ${bindir}/ssh ssh.${PN} +} + +pkg_postrm_openssh-scp() { + update-alternatives --remove ${bindir}/scp scp.${PN} +} + +pkg_postrm_openssh-sshd() { +if test "x$D" != "x"; then + exit 1 +else + ${sysconfdir}/init.d/sshd stop + deluser sshd + delgroup sshd + update-rc.d -f sshd remove +fi +} + +CONFFILES_openssh-sshd = "${sysconfdir}/ssh/sshd_config" +CONFFILES_openssh-ssh = "${sysconfdir}/ssh/ssh_config" -- cgit v1.2.3 From ba4cc08fd883e6f13ad60e402ac404683d829da3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 Aug 2006 12:43:57 +0000 Subject: openssh 4.3: wind back PR now it's still safe --- packages/openssh/openssh_4.3p2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openssh/openssh_4.3p2.bb b/packages/openssh/openssh_4.3p2.bb index e696c69ecb..36924c5a4a 100644 --- a/packages/openssh/openssh_4.3p2.bb +++ b/packages/openssh/openssh_4.3p2.bb @@ -15,7 +15,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf " -PR = "r10" +PR = "r0" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://sshd_config \ -- cgit v1.2.3 From fdfb047889fedb4ea809b2c9e3a85417aac1b837 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 7 Aug 2006 14:15:13 +0000 Subject: alsa-utils_1.0.11.bb : Added alsa-conf to alsamixer RDEPENDS --- packages/alsa/alsa-utils_1.0.11.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/alsa/alsa-utils_1.0.11.bb b/packages/alsa/alsa-utils_1.0.11.bb index 83bc8c5c86..10ebacee9b 100644 --- a/packages/alsa/alsa-utils_1.0.11.bb +++ b/packages/alsa/alsa-utils_1.0.11.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "alsa-lib ncurses" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" @@ -49,5 +49,6 @@ DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configura RDEPENDS_alsa-utils-aplay += "alsa-conf" RDEPENDS_alsa-utils-amixer += "alsa-conf" +RDEPENDS_alsa-utils-alsamixer += "alsa-conf" ALLOW_EMPTY_alsa-utils = "1" -- cgit v1.2.3 From f28df7b37210dbf4d9bc7aa1baebd0f3ef1c769b Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 7 Aug 2006 14:33:48 +0000 Subject: libmimedir: Add patch to allow writing the sequence property. --- .../libmimedir/files/mimedir-write-sequence.patch | 51 ++++++++++++++++++++++ packages/libmimedir/libmimedir_0.3.1-20060804.bb | 5 ++- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 packages/libmimedir/files/mimedir-write-sequence.patch diff --git a/packages/libmimedir/files/mimedir-write-sequence.patch b/packages/libmimedir/files/mimedir-write-sequence.patch new file mode 100644 index 0000000000..b03c5d9ca7 --- /dev/null +++ b/packages/libmimedir/files/mimedir-write-sequence.patch @@ -0,0 +1,51 @@ +? mimedir/.deps +? mimedir/.libs +? mimedir/libmimedir.la +? mimedir/mimedir-attachment.lo +? mimedir/mimedir-attendee.lo +? mimedir/mimedir-attribute.lo +? mimedir/mimedir-datetime.lo +? mimedir/mimedir-init.lo +? mimedir/mimedir-marshal.lo +? mimedir/mimedir-period.lo +? mimedir/mimedir-profile.lo +? mimedir/mimedir-recurrence.lo +? mimedir/mimedir-utils.lo +? mimedir/mimedir-valarm.lo +? mimedir/mimedir-vcal.lo +? mimedir/mimedir-vcard-address.lo +? mimedir/mimedir-vcard-email.lo +? mimedir/mimedir-vcard-phone.lo +? mimedir/mimedir-vcard.lo +? mimedir/mimedir-vcomponent.lo +? mimedir/mimedir-vevent.lo +? mimedir/mimedir-vfreebusy.lo +? mimedir/mimedir-vjournal.lo +? mimedir/mimedir-vtimezone.lo +? mimedir/mimedir-vtodo.lo +Index: mimedir/mimedir-vcomponent.c +=================================================================== +RCS file: /cvs/gnome/libmimedir/mimedir/mimedir-vcomponent.c,v +retrieving revision 1.28 +diff -B -b -u -r1.28 mimedir-vcomponent.c +--- mimedir/mimedir-vcomponent.c 26 Nov 2005 15:40:20 -0000 1.28 ++++ mimedir/mimedir-vcomponent.c 7 Aug 2006 12:20:01 -0000 +@@ -456,7 +456,7 @@ + _("Sequence"), + _("Sequence number"), + 0, G_MAXINT, 0, +- G_PARAM_READABLE); ++ G_PARAM_READWRITE); + g_object_class_install_property (gobject_class, PROP_SEQ, pspec); + } + +@@ -684,6 +684,9 @@ + g_object_ref (G_OBJECT (priv->last_modified)); + break; + } ++ case PROP_SEQ: ++ priv->sequence = g_value_get_uint (value); ++ break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); diff --git a/packages/libmimedir/libmimedir_0.3.1-20060804.bb b/packages/libmimedir/libmimedir_0.3.1-20060804.bb index cf6b9890a8..5337f30df3 100644 --- a/packages/libmimedir/libmimedir_0.3.1-20060804.bb +++ b/packages/libmimedir/libmimedir_0.3.1-20060804.bb @@ -3,13 +3,14 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "intltool-native glib-2.0" -PR = "r0" +PR = "r1" SRCDATE = "20060804" #Remove the dash below when 0.3.1 changes in PV PV = "0.3.1+cvs-${SRCDATE}" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ - file://mimedir-update.patch;patch=1" + file://mimedir-update.patch;patch=1 \ + file://mimedir-write-sequence.patch;patch=1;pnum=0" S = "${WORKDIR}/libmimedir" -- cgit v1.2.3 From d2e4966424bc687379c9cc2dab23c1c376a0aca2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 Aug 2006 15:20:06 +0000 Subject: libmimedir 03.1.+cvs: bump PR + up default_pref --- packages/libmimedir/libmimedir_0.3.1-20060804.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/libmimedir/libmimedir_0.3.1-20060804.bb b/packages/libmimedir/libmimedir_0.3.1-20060804.bb index 5337f30df3..8a56ec5eed 100644 --- a/packages/libmimedir/libmimedir_0.3.1-20060804.bb +++ b/packages/libmimedir/libmimedir_0.3.1-20060804.bb @@ -3,7 +3,8 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "intltool-native glib-2.0" -PR = "r1" +PR = "r2" +DEFAULT_PREFERENCE = "5" SRCDATE = "20060804" #Remove the dash below when 0.3.1 changes in PV PV = "0.3.1+cvs-${SRCDATE}" -- cgit v1.2.3 From 52985b3507d05b5d6be3401c257d94bc0e7cefa5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 Aug 2006 15:26:56 +0000 Subject: libmimedir: update PV to match so-version --- packages/libmimedir/libmimedir_0.3.1-20060804.bb | 28 ------------------------ packages/libmimedir/libmimedir_0.4.0-20060804.bb | 27 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 packages/libmimedir/libmimedir_0.3.1-20060804.bb create mode 100644 packages/libmimedir/libmimedir_0.4.0-20060804.bb diff --git a/packages/libmimedir/libmimedir_0.3.1-20060804.bb b/packages/libmimedir/libmimedir_0.3.1-20060804.bb deleted file mode 100644 index 8a56ec5eed..0000000000 --- a/packages/libmimedir/libmimedir_0.3.1-20060804.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "LGPL" -DEPENDS = "intltool-native glib-2.0" -PR = "r2" -DEFAULT_PREFERENCE = "5" -SRCDATE = "20060804" -#Remove the dash below when 0.3.1 changes in PV -PV = "0.3.1+cvs-${SRCDATE}" - -SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ - file://mimedir-update.patch;patch=1 \ - file://mimedir-write-sequence.patch;patch=1;pnum=0" - -S = "${WORKDIR}/libmimedir" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-gtk-doc" - -do_stage() { - autotools_stage_all -} - -PACKAGES += libmimedir-utils -FILES_libmimedir-utils = "${bindir}" -FILES_${PN} = "${libdir}" diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb new file mode 100644 index 0000000000..14c1209b2e --- /dev/null +++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "intltool-native glib-2.0" +PR = "r0" +DEFAULT_PREFERENCE = "5" +SRCDATE = "20060804" +PV = "0.4.0+cvs${SRCDATE}" + +SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ + file://mimedir-update.patch;patch=1 \ + file://mimedir-write-sequence.patch;patch=1;pnum=0" + +S = "${WORKDIR}/libmimedir" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + autotools_stage_all +} + +PACKAGES += libmimedir-utils +FILES_libmimedir-utils = "${bindir}" +FILES_${PN} = "${libdir}" -- cgit v1.2.3 From e3d48526766de572feae20bb7153588641e188e7 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 7 Aug 2006 17:09:50 +0000 Subject: slugos-packages.bb: moved memtester to the working packages --- packages/meta/slugos-packages.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 3ac59c3719..db8e87e6ea 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r9" +PR = "r10" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -108,6 +108,7 @@ SLUGOS_PACKAGES = "\ make \ masqmail \ mdadm \ + memtester \ mgetty \ miau \ microcom \ @@ -179,7 +180,6 @@ SLUGOS_PACKAGES = "\ # Packages currently broken on all platforms SLUGOS_BROKEN_PACKAGES = "\ irssi \ - memtester \ obexftp \ qc-usb-messenger \ unionfs-modules \ -- cgit v1.2.3 From 7a4add0595a24cb61e3b610496c3cf74787beaca Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 7 Aug 2006 20:38:58 +0000 Subject: bootchart: add missing patch --- packages/bootchart/files/.mtn2git_empty | 0 packages/bootchart/files/handheld.patch | 105 ++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 packages/bootchart/files/.mtn2git_empty create mode 100644 packages/bootchart/files/handheld.patch diff --git a/packages/bootchart/files/.mtn2git_empty b/packages/bootchart/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/bootchart/files/handheld.patch b/packages/bootchart/files/handheld.patch new file mode 100644 index 0000000000..c3ded668bc --- /dev/null +++ b/packages/bootchart/files/handheld.patch @@ -0,0 +1,105 @@ +diff -ur bootchart-0.9-org/script/bootchartd bootchart-0.9/script/bootchartd +--- bootchart-0.9-org/script/bootchartd 2005-11-13 19:40:01.000000000 +0200 ++++ bootchart-0.9/script/bootchartd 2006-08-03 19:06:22.000000000 +0300 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # Bootchart logger script + # Ziga Mahkovec +@@ -43,10 +43,12 @@ + # boot), a tmpfs is mounted in /mnt. The mount point is immediately + # released using a lazy umount, so the script must never leave that + # directory. +- LOG_DIR="$( mktemp -d /tmp/bootchart.XXXXXX 2>/dev/null )" ++ #LOG_DIR="$( mktemp -d /tmp/bootchart.XXXXXX 2>/dev/null )" ++ LOG_DIR="" + if [ -z "$LOG_DIR" ]; then +- LOG_DIR="/mnt" +- LAZY_UMOUNT="yes" ++ LOG_DIR="/bootchart" ++ mkdir -p $LOG_DIR ++ #LAZY_UMOUNT="yes" + mount -n -t tmpfs -o size=$TMPFS_SIZE none "$LOG_DIR" >/dev/null 2>&1 + fi + cd "$LOG_DIR" +@@ -54,7 +56,7 @@ + [ -n "$LAZY_UMOUNT" ] && umount -nfl "$LOG_DIR" + + # Enable process accounting if configured +- if [ "$PROCESS_ACCOUNTING" = "yes" ]; then ++ if [ "$PROCESS_ACCOUNTING" = "yes" -a -x /usr/sbin/accton ]; then + > kernel_pacct + accton kernel_pacct + fi +@@ -153,7 +155,7 @@ + + # Stop process accounting if configured + local pacct= +- if [ "$PROCESS_ACCOUNTING" = "yes" ]; then ++ if [ "$PROCESS_ACCOUNTING" = "yes" -a -x /usr/sbin/accton ]; then + accton + pacct=kernel_pacct + fi +@@ -215,18 +217,34 @@ + # Started by the kernel. Start the logger in background and exec + # init(1). + IN_INIT="yes" +- echo "Starting bootchart logging" +- start & + + # Optionally, an alternative init(1) process may be specified using + # the kernel command line (e.g. "bootchart_init=/sbin/initng") ++ # Optionally, possible to override sample period using ++ # the kernel command line (e.g. "bootchart_sample_period=0.1") + init="/sbin/init" +- for i in $@; do ++ ++ #kparams=$@ ++ # For some reason, handheld kernel doesn't pass command line here - fish for it ++ mount -t proc none /bootchart ++ kparams=`cat /bootchart/cmdline` ++ umount /bootchart ++ ++ echo "Kernel params: $kparams" ++ for i in $kparams; do + if [ "${i%%=*}" = "bootchart_init" ]; then + init="${i#*=}" + break + fi ++ if [ "${i%%=*}" = "bootchart_sample_period" ]; then ++ SAMPLE_PERIOD="${i#*=}" ++ break ++ fi + done ++ ++ echo "Starting bootchart logging, sample period: ${SAMPLE_PERIOD}s" ++ start & ++ + exec $init $* + fi + +diff -ur bootchart-0.9-org/script/bootchartd.conf bootchart-0.9/script/bootchartd.conf +--- bootchart-0.9-org/script/bootchartd.conf 2005-11-13 19:40:01.000000000 +0200 ++++ bootchart-0.9/script/bootchartd.conf 2006-08-03 15:21:31.000000000 +0300 +@@ -10,16 +10,17 @@ + BOOTLOG_LOCK=".lock" + + # Sampling period (in seconds) +-SAMPLE_PERIOD=0.2 ++# Default 0.2 is not fine enough to catch peculiarities in OE-based distro ++SAMPLE_PERIOD=0.1 + + # Whether to enable and store BSD process accounting information. The + # kernel needs to be configured to enable v3 accounting + # (CONFIG_BSD_PROCESS_ACCT_V3). accton from the GNU accounting utilities + # is also required. +-PROCESS_ACCOUNTING="no" ++PROCESS_ACCOUNTING="yes" + + # Tarball for the various boot log files +-BOOTLOG_DEST=/var/log/bootchart.tgz ++BOOTLOG_DEST=/bootchart.tgz + + # Whether to automatically generate the boot chart once the boot logger + # completes. The boot chart will be generated in $AUTO_RENDER_DIR. -- cgit v1.2.3 From cf19e0b8978e4e57ec521ce4ca0ef3cea634befa Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 7 Aug 2006 20:42:01 +0000 Subject: libvncserver add 0.8.2, remove older ones. patch based on bug #1281, thanks gfellerpatrik@gmx.net --- packages/libvncserver/libvncserver_0.6.bb | 36 ---------------------------- packages/libvncserver/libvncserver_0.7.1.bb | 37 ----------------------------- packages/libvncserver/libvncserver_0.8.2.bb | 33 +++++++++++++++++++++++++ packages/libvncserver/x11vnc_0.7.1.bb | 19 --------------- 4 files changed, 33 insertions(+), 92 deletions(-) delete mode 100644 packages/libvncserver/libvncserver_0.6.bb delete mode 100644 packages/libvncserver/libvncserver_0.7.1.bb create mode 100644 packages/libvncserver/libvncserver_0.8.2.bb delete mode 100644 packages/libvncserver/x11vnc_0.7.1.bb diff --git a/packages/libvncserver/libvncserver_0.6.bb b/packages/libvncserver/libvncserver_0.6.bb deleted file mode 100644 index 386f266d2d..0000000000 --- a/packages/libvncserver/libvncserver_0.6.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "library for easy implementation of a RDP/VNC server" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "zlib jpeg" -LICENSE = "GPL" -PACKAGES = "libvncserver-storepasswd libvncserver-javaapplet" -FILES_libvncserver-storepasswd = "${bindir}/storepasswd" -FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \ - ${datadir}/fbvncserver/classes/VncViewer.jar" - -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz" - -CFLAGS_append = " -D_REENTRANT" -S = "${WORKDIR}/LibVNCServer-${PV}" - -inherit autotools - -do_stage () { - install -d ${STAGING_INCDIR}/rfb - install -m 0644 rfb/rfb.h rfb/rfbproto.h rfb/rfbint.h rfb/rfbconfig.h \ - rfb/rfbclient.h rfb/rfbregion.h rfb/keysym.h \ - rfb/default8x16.h ${STAGING_INCDIR}/rfb - - oe_libinstall -a -C libvncclient libvncclient ${STAGING_LIBDIR}/ - oe_libinstall -a libvncserver ${STAGING_LIBDIR}/ -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 examples/storepasswd ${D}${bindir} - install -d ${D}${datadir}/fbvncserver/classes - install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/ - install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/ -} diff --git a/packages/libvncserver/libvncserver_0.7.1.bb b/packages/libvncserver/libvncserver_0.7.1.bb deleted file mode 100644 index 80a70e5f57..0000000000 --- a/packages/libvncserver/libvncserver_0.7.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "library for easy implementation of a RDP/VNC server" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "zlib jpeg" -LICENSE = "GPL" -PACKAGES = "libvncserver-storepasswd libvncserver-javaapplet" -FILES_libvncserver-storepasswd = "${bindir}/storepasswd" -FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \ - ${datadir}/fbvncserver/classes/VncViewer.jar" - -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz" - -CFLAGS_append = " -D_REENTRANT" -S = "${WORKDIR}/LibVNCServer-${PV}" -# Original SUBDIRS is='libvncserver examples contrib x11vnc vncterm classes libvncclient client_examples test' -EXTRA_OEMAKE_append=" SUBDIRS='libvncserver examples classes'" - -inherit autotools - -do_stage () { - install -d ${STAGING_INCDIR}/rfb - install -m 0644 rfb/rfb.h rfb/rfbproto.h rfb/rfbint.h rfb/rfbconfig.h \ - rfb/rfbclient.h rfb/rfbregion.h rfb/keysym.h \ - rfb/default8x16.h ${STAGING_INCDIR}/rfb - - oe_libinstall -a -C libvncserver libvncserver ${STAGING_LIBDIR}/ -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 examples/storepasswd ${D}${bindir} - install -d ${D}${datadir}/fbvncserver/classes - install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/ - install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/ -} diff --git a/packages/libvncserver/libvncserver_0.8.2.bb b/packages/libvncserver/libvncserver_0.8.2.bb new file mode 100644 index 0000000000..480a888745 --- /dev/null +++ b/packages/libvncserver/libvncserver_0.8.2.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "A library to support implementations of RDP/VNC servers" +LICENSE = "GPLv2" +HOMEPAGE = "http://sourceforge.net/projects/libvncserver" +AUTHOR = "Johannes Schindelin " +MAINTAINER = "Patrik Gfeller " +SECTION = "libs" +PRIORITY = "optional" +PROVIDES = "x11vnc" +DEPENDS = "virtual/libsdl virtual/libx11 zlib jpeg" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz;md5sum=17a18e398af6c1730f72068022a152aa" +S = "${WORKDIR}/LibVNCServer-${PV}" + +inherit autotools + +do_stage() { + autotools_stage_all +} + +do_install_append() { + install -d ${D}${bindir} + install -m 0755 examples/storepasswd ${D}${bindir} + install -d ${D}${datadir}/fbvncserver/classes + install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/ + install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/ +} + +PACKAGES =+ "x11vnc libvncserver-storepasswd libvncserver-javaapplet" +FILES_x11vnc = "${bindir}/x11vnc ${bindir}/LinuxVNC" +FILES_libvncserver-storepasswd = "${bindir}/storepasswd" +FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \ + ${datadir}/fbvncserver/classes/VncViewer.jar" diff --git a/packages/libvncserver/x11vnc_0.7.1.bb b/packages/libvncserver/x11vnc_0.7.1.bb deleted file mode 100644 index 944710497f..0000000000 --- a/packages/libvncserver/x11vnc_0.7.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "X11 VNC server" -SECTION = "x11" -PRIORITY = "optional" -DEPENDS = "zlib jpeg virtual/libx11" -LICENSE = "GPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz" - -CFLAGS_append = " -D_REENTRANT" -S = "${WORKDIR}/LibVNCServer-${PV}" -# Original SUBDIRS is='libvncserver examples contrib vncterm classes libvncclient client_examples test' -EXTRA_OEMAKE_append=" SUBDIRS='libvncserver x11vnc'" - -inherit autotools - -do_install () { - install -d ${D}${bindir} - install -m 0755 x11vnc/x11vnc ${D}${bindir} -} -- cgit v1.2.3 From 288ecbe2bc5aab2daebd615cda1d6a25632b7227 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 7 Aug 2006 20:54:46 +0000 Subject: linux-oz-2.6.16: Reclassify some patches after mainline merges --- packages/linux/linux-openzaurus_2.6.16.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 5c9a5dcfc1..3aa85c1f98 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -61,12 +61,12 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/backlight_sysfs_fix-r0.patch;patch=1;status=merged \ ${RPSRC}/pxaohci_pwrlimit-r0.patch;patch=1;status=merged \ ${RPSRC}/mmc_oops_fix-r1.patch;patch=1;status=merged \ - ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \ - ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \ - ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \ - ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ - file://00-hostap.patch;patch=1;status=pending \ - file://10-pcnet.patch;patch=1;status=pending \ + ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=merged \ + ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=merged \ + ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \ + ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \ + file://00-hostap.patch;patch=1;status=merged \ + file://10-pcnet.patch;patch=1;status=merged \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ ${RPSRC}/asoc_fixups-r0.patch;patch=1 \ ${RPSRC}/hx2750_base-r24.patch;patch=1 \ @@ -78,7 +78,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/input_power-r4.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ - ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=pending \ + ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=merged \ ${RPSRC}/zaurus_reboot-r0.patch;patch=1;status=merged \ ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \ ${RPSRC}/pm_changes-r1.patch;patch=1 \ -- cgit v1.2.3 From 1cb8bf5179e4c38c0eb09dcf7ea0309fbfad195e Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 7 Aug 2006 21:04:36 +0000 Subject: zlib-1.2.3: -made zlib uses autotools, that introduced autotools.patch and make libtool_staging.patch and sane-target.patch obsolete -adding myself as maintainer after talked with kergoth -simplify zlib_1.2.3.bb --- packages/zlib/zlib-1.2.3/autotools.patch | 649 +++++++++++++++++++++++++ packages/zlib/zlib-1.2.3/libtool_staging.patch | 28 -- packages/zlib/zlib-1.2.3/sane-target.patch | 38 -- packages/zlib/zlib_1.2.3.bb | 23 +- 4 files changed, 653 insertions(+), 85 deletions(-) create mode 100644 packages/zlib/zlib-1.2.3/autotools.patch delete mode 100644 packages/zlib/zlib-1.2.3/libtool_staging.patch delete mode 100644 packages/zlib/zlib-1.2.3/sane-target.patch diff --git a/packages/zlib/zlib-1.2.3/autotools.patch b/packages/zlib/zlib-1.2.3/autotools.patch new file mode 100644 index 0000000000..722a20d499 --- /dev/null +++ b/packages/zlib/zlib-1.2.3/autotools.patch @@ -0,0 +1,649 @@ +diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure +--- zlib-1.2.3/configure 2005-07-11 22:11:57.000000000 +0200 ++++ zlib-1.2.3new/configure 1970-01-01 01:00:00.000000000 +0100 +@@ -1,459 +0,0 @@ +-#!/bin/sh +-# configure script for zlib. This script is needed only if +-# you wish to build a shared library and your system supports them, +-# of if you need special compiler, flags or install directory. +-# Otherwise, you can just use directly "make test; make install" +-# +-# To create a shared library, use "configure --shared"; by default a static +-# library is created. If the primitive shared library support provided here +-# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz +-# +-# To impose specific compiler or flags or install directory, use for example: +-# prefix=$HOME CC=cc CFLAGS="-O4" ./configure +-# or for csh/tcsh users: +-# (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure) +-# LDSHARED is the command to be used to create a shared library +- +-# Incorrect settings of CC or CFLAGS may prevent creating a shared library. +-# If you have problems, try without defining CC and CFLAGS before reporting +-# an error. +- +-LIBS=libz.a +-LDFLAGS="-L. ${LIBS}" +-VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` +-VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` +-VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` +-AR=${AR-"ar rc"} +-RANLIB=${RANLIB-"ranlib"} +-prefix=${prefix-/usr/local} +-exec_prefix=${exec_prefix-'${prefix}'} +-libdir=${libdir-'${exec_prefix}/lib'} +-includedir=${includedir-'${prefix}/include'} +-mandir=${mandir-'${prefix}/share/man'} +-shared_ext='.so' +-shared=0 +-gcc=0 +-old_cc="$CC" +-old_cflags="$CFLAGS" +- +-while test $# -ge 1 +-do +-case "$1" in +- -h* | --h*) +- echo 'usage:' +- echo ' configure [--shared] [--prefix=PREFIX] [--exec_prefix=EXPREFIX]' +- echo ' [--libdir=LIBDIR] [--includedir=INCLUDEDIR]' +- exit 0;; +- -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;; +- -p* | --p*) prefix="$2"; shift; shift;; +- -e* | --e*) exec_prefix="$2"; shift; shift;; +- -l* | --l*) libdir="$2"; shift; shift;; +- -i* | --i*) includedir="$2"; shift; shift;; +- -s* | --s*) shared=1; shift;; +- *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;; +- esac +-done +- +-test=ztest$$ +-cat > $test.c </dev/null; then +- CC="$cc" +- SFLAGS=${CFLAGS-"-fPIC -O3"} +- CFLAGS="$cflags" +- case `(uname -s || echo unknown) 2>/dev/null` in +- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; +- CYGWIN* | Cygwin* | cygwin* | OS/2* ) +- EXE='.exe';; +- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 +- # (alain.bonnefoy@icbt.com) +- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};; +- HP-UX*) +- LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"} +- case `(uname -m || echo unknown) 2>/dev/null` in +- ia64) +- shared_ext='.so' +- SHAREDLIB='libz.so';; +- *) +- shared_ext='.sl' +- SHAREDLIB='libz.sl';; +- esac;; +- Darwin*) shared_ext='.dylib' +- SHAREDLIB=libz$shared_ext +- SHAREDLIBV=libz.$VER$shared_ext +- SHAREDLIBM=libz.$VER1$shared_ext +- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};; +- *) LDSHARED=${LDSHARED-"$cc -shared"};; +- esac +-else +- # find system name and corresponding cc options +- CC=${CC-cc} +- case `(uname -sr || echo unknown) 2>/dev/null` in +- HP-UX*) SFLAGS=${CFLAGS-"-O +z"} +- CFLAGS=${CFLAGS-"-O"} +-# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"} +- LDSHARED=${LDSHARED-"ld -b"} +- case `(uname -m || echo unknown) 2>/dev/null` in +- ia64) +- shared_ext='.so' +- SHAREDLIB='libz.so';; +- *) +- shared_ext='.sl' +- SHAREDLIB='libz.sl';; +- esac;; +- IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} +- CFLAGS=${CFLAGS-"-ansi -O2"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"} +- CFLAGS=${CFLAGS-"-O -std1"} +- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};; +- OSF1*) SFLAGS=${CFLAGS-"-O -std1"} +- CFLAGS=${CFLAGS-"-O -std1"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- QNX*) SFLAGS=${CFLAGS-"-4 -O"} +- CFLAGS=${CFLAGS-"-4 -O"} +- LDSHARED=${LDSHARED-"cc"} +- RANLIB=${RANLIB-"true"} +- AR="cc -A";; +- SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} +- CFLAGS=${CFLAGS-"-O3"} +- LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; +- SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} +- CFLAGS=${CFLAGS-"-fast -xcg89"} +- LDSHARED=${LDSHARED-"cc -G"};; +- SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} +- CFLAGS=${CFLAGS-"-O2"} +- LDSHARED=${LDSHARED-"ld"};; +- SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"} +- CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"} +- LDSHARED=${LDSHARED-"cc -xarch=v9b"};; +- UNIX_System_V\ 4.2.0) +- SFLAGS=${CFLAGS-"-KPIC -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- UNIX_SV\ 4.2MP) +- SFLAGS=${CFLAGS-"-Kconform_pic -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- OpenUNIX\ 5) +- SFLAGS=${CFLAGS-"-KPIC -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- AIX*) # Courtesy of dbakker@arrayasolutions.com +- SFLAGS=${CFLAGS-"-O -qmaxmem=8192"} +- CFLAGS=${CFLAGS-"-O -qmaxmem=8192"} +- LDSHARED=${LDSHARED-"xlc -G"};; +- # send working options for other systems to support@gzip.org +- *) SFLAGS=${CFLAGS-"-O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- esac +-fi +- +-SHAREDLIB=${SHAREDLIB-"libz$shared_ext"} +-SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"} +-SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} +- +-if test $shared -eq 1; then +- echo Checking for shared library support... +- # we must test in two steps (cc then ld), required at least on SunOS 4.x +- if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && +- test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then +- CFLAGS="$SFLAGS" +- LIBS="$SHAREDLIBV" +- echo Building shared library $SHAREDLIBV with $CC. +- elif test -z "$old_cc" -a -z "$old_cflags"; then +- echo No shared library support. +- shared=0; +- else +- echo 'No shared library support; try without defining CC and CFLAGS' +- shared=0; +- fi +-fi +-if test $shared -eq 0; then +- LDSHARED="$CC" +- echo Building static library $LIBS version $VER with $CC. +-else +- LDFLAGS="-L. ${SHAREDLIBV}" +-fi +- +-cat > $test.c < +-int main() { return 0; } +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h +- echo "Checking for unistd.h... Yes." +-else +- cp -p zconf.in.h zconf.h +- echo "Checking for unistd.h... No." +-fi +- +-cat > $test.c < +-#include +-#include "zconf.h" +- +-int main() +-{ +-#ifndef STDC +- choke me +-#endif +- +- return 0; +-} +-EOF +- +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()" +- +- cat > $test.c < +-#include +- +-int mytest(char *fmt, ...) +-{ +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- vsnprintf(buf, sizeof(buf), fmt, ap); +- va_end(ap); +- return 0; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then +- echo "Checking for vsnprintf() in stdio.h... Yes." +- +- cat >$test.c < +-#include +- +-int mytest(char *fmt, ...) +-{ +- int n; +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- n = vsnprintf(buf, sizeof(buf), fmt, ap); +- va_end(ap); +- return n; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of vsnprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_vsnprintf_void" +- echo "Checking for return value of vsnprintf()... No." +- echo " WARNING: apparently vsnprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- else +- CFLAGS="$CFLAGS -DNO_vsnprintf" +- echo "Checking for vsnprintf() in stdio.h... No." +- echo " WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" +- echo " can build but will be open to possible buffer-overflow security" +- echo " vulnerabilities." +- +- cat >$test.c < +-#include +- +-int mytest(char *fmt, ...) +-{ +- int n; +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- n = vsprintf(buf, fmt, ap); +- va_end(ap); +- return n; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of vsprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_vsprintf_void" +- echo "Checking for return value of vsprintf()... No." +- echo " WARNING: apparently vsprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- fi +-else +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()" +- +- cat >$test.c < +- +-int mytest() +-{ +- char buf[20]; +- +- snprintf(buf, sizeof(buf), "%s", "foo"); +- return 0; +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then +- echo "Checking for snprintf() in stdio.h... Yes." +- +- cat >$test.c < +- +-int mytest() +-{ +- char buf[20]; +- +- return snprintf(buf, sizeof(buf), "%s", "foo"); +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of snprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_snprintf_void" +- echo "Checking for return value of snprintf()... No." +- echo " WARNING: apparently snprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- else +- CFLAGS="$CFLAGS -DNO_snprintf" +- echo "Checking for snprintf() in stdio.h... No." +- echo " WARNING: snprintf() not found, falling back to sprintf(). zlib" +- echo " can build but will be open to possible buffer-overflow security" +- echo " vulnerabilities." +- +- cat >$test.c < +- +-int mytest() +-{ +- char buf[20]; +- +- return sprintf(buf, "%s", "foo"); +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of sprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_sprintf_void" +- echo "Checking for return value of sprintf()... No." +- echo " WARNING: apparently sprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- fi +-fi +- +-cat >$test.c < +-int main() { return 0; } +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for errno.h... Yes." +-else +- echo "Checking for errno.h... No." +- CFLAGS="$CFLAGS -DNO_ERRNO_H" +-fi +- +-cat > $test.c < +-#include +-#include +-caddr_t hello() { +- return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0); +-} +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- CFLAGS="$CFLAGS -DUSE_MMAP" +- echo Checking for mmap support... Yes. +-else +- echo Checking for mmap support... No. +-fi +- +-CPP=${CPP-"$CC -E"} +-case $CFLAGS in +- *ASMV*) +- if test "`nm $test.o | grep _hello`" = ""; then +- CPP="$CPP -DNO_UNDERLINE" +- echo Checking for underline in external names... No. +- else +- echo Checking for underline in external names... Yes. +- fi;; +-esac +- +-rm -f $test.[co] $test $test$shared_ext +- +-# udpate Makefile +-sed < Makefile.in " +-/^CC *=/s#=.*#=$CC# +-/^CFLAGS *=/s#=.*#=$CFLAGS# +-/^CPP *=/s#=.*#=$CPP# +-/^LDSHARED *=/s#=.*#=$LDSHARED# +-/^LIBS *=/s#=.*#=$LIBS# +-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB# +-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV# +-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM# +-/^AR *=/s#=.*#=$AR# +-/^RANLIB *=/s#=.*#=$RANLIB# +-/^EXE *=/s#=.*#=$EXE# +-/^prefix *=/s#=.*#=$prefix# +-/^exec_prefix *=/s#=.*#=$exec_prefix# +-/^libdir *=/s#=.*#=$libdir# +-/^includedir *=/s#=.*#=$includedir# +-/^mandir *=/s#=.*#=$mandir# +-/^LDFLAGS *=/s#=.*#=$LDFLAGS# +-" > Makefile +diff -Naur zlib-1.2.3/configure.ac zlib-1.2.3new/configure.ac +--- zlib-1.2.3/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ zlib-1.2.3new/configure.ac 2006-08-07 20:38:31.612402750 +0200 +@@ -0,0 +1,14 @@ ++AC_INIT(zlib,1.2.3) ++AC_CONFIG_SRCDIR(adler32.c) ++AM_INIT_AUTOMAKE(zlibs,1.2.3) ++ ++AC_PREREQ([2.59]) ++ ++AC_PROG_CC([gcc]) ++AC_PROG_LIBTOOL ++ ++AC_HEADER_STDC ++ ++AC_CONFIG_FILES([Makefile]) ++ ++AC_OUTPUT +diff -Naur zlib-1.2.3/Makefile.am zlib-1.2.3new/Makefile.am +--- zlib-1.2.3/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ zlib-1.2.3new/Makefile.am 2006-08-07 19:57:26.522344250 +0200 +@@ -0,0 +1,6 @@ ++lib_LTLIBRARIES = libz.la ++ ++libz_la_SOURCES = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c \ ++ trees.c zutil.c inflate.c infback.c inftrees.c inffast.c ++ ++libz_la_LDFLAGS = -version-number 1:2:3 +diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in +--- zlib-1.2.3/Makefile.in 2005-07-18 04:25:21.000000000 +0200 ++++ zlib-1.2.3new/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +@@ -1,154 +0,0 @@ +-# Makefile for zlib +-# Copyright (C) 1995-2005 Jean-loup Gailly. +-# For conditions of distribution and use, see copyright notice in zlib.h +- +-# To compile and test, type: +-# ./configure; make test +-# The call of configure is optional if you don't have special requirements +-# If you wish to build zlib as a shared library, use: ./configure -s +- +-# To use the asm code, type: +-# cp contrib/asm?86/match.S ./match.S +-# make LOC=-DASMV OBJA=match.o +- +-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: +-# make install +-# To install in $HOME instead of /usr/local, use: +-# make install prefix=$HOME +- +-CC=cc +- +-CFLAGS=-O +-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 +-#CFLAGS=-g -DDEBUG +-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ +-# -Wstrict-prototypes -Wmissing-prototypes +- +-LDFLAGS=libz.a +-LDSHARED=$(CC) +-CPP=$(CC) -E +- +-LIBS=libz.a +-SHAREDLIB=libz.so +-SHAREDLIBV=libz.so.1.2.3 +-SHAREDLIBM=libz.so.1 +- +-AR=ar rc +-RANLIB=ranlib +-TAR=tar +-SHELL=/bin/sh +-EXE= +- +-prefix = /usr/local +-exec_prefix = ${prefix} +-libdir = ${exec_prefix}/lib +-includedir = ${prefix}/include +-mandir = ${prefix}/share/man +-man3dir = ${mandir}/man3 +- +-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ +- zutil.o inflate.o infback.o inftrees.o inffast.o +- +-OBJA = +-# to use the asm code: make OBJA=match.o +- +-TEST_OBJS = example.o minigzip.o +- +-all: example$(EXE) minigzip$(EXE) +- +-check: test +-test: all +- @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ +- echo hello world | ./minigzip | ./minigzip -d || \ +- echo ' *** minigzip test FAILED ***' ; \ +- if ./example; then \ +- echo ' *** zlib test OK ***'; \ +- else \ +- echo ' *** zlib test FAILED ***'; \ +- fi +- +-libz.a: $(OBJS) $(OBJA) +- $(AR) $@ $(OBJS) $(OBJA) +- -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 +- +-match.o: match.S +- $(CPP) match.S > _match.s +- $(CC) -c _match.s +- mv _match.o match.o +- rm -f _match.s +- +-$(SHAREDLIBV): $(OBJS) +- $(LDSHARED) -o $@ $(OBJS) +- rm -f $(SHAREDLIB) $(SHAREDLIBM) +- ln -s $@ $(SHAREDLIB) +- ln -s $@ $(SHAREDLIBM) +- +-example$(EXE): example.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) +- +-minigzip$(EXE): minigzip.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) +- +-install: $(LIBS) +- -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi +- -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi +- -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi +- -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi +- cp zlib.h zconf.h $(includedir) +- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h +- cp $(LIBS) $(libdir) +- cd $(libdir); chmod 755 $(LIBS) +- -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 +- cd $(libdir); if test -f $(SHAREDLIBV); then \ +- rm -f $(SHAREDLIB) $(SHAREDLIBM); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIB); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ +- (ldconfig || true) >/dev/null 2>&1; \ +- fi +- cp zlib.3 $(man3dir) +- chmod 644 $(man3dir)/zlib.3 +-# The ranlib in install is needed on NeXTSTEP which checks file times +-# ldconfig is for Linux +- +-uninstall: +- cd $(includedir); \ +- cd $(libdir); rm -f libz.a; \ +- if test -f $(SHAREDLIBV); then \ +- rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ +- fi +- cd $(man3dir); rm -f zlib.3 +- +-mostlyclean: clean +-clean: +- rm -f *.o *~ example$(EXE) minigzip$(EXE) \ +- libz.* foo.gz so_locations \ +- _match.s maketree contrib/infback9/*.o +- +-maintainer-clean: distclean +-distclean: clean +- cp -p Makefile.in Makefile +- cp -p zconf.in.h zconf.h +- rm -f .DS_Store +- +-tags: +- etags *.[ch] +- +-depend: +- makedepend -- $(CFLAGS) -- *.[ch] +- +-# DO NOT DELETE THIS LINE -- make depend depends on it. +- +-adler32.o: zlib.h zconf.h +-compress.o: zlib.h zconf.h +-crc32.o: crc32.h zlib.h zconf.h +-deflate.o: deflate.h zutil.h zlib.h zconf.h +-example.o: zlib.h zconf.h +-gzio.o: zutil.h zlib.h zconf.h +-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-inftrees.o: zutil.h zlib.h zconf.h inftrees.h +-minigzip.o: zlib.h zconf.h +-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h +-uncompr.o: zlib.h zconf.h +-zutil.o: zutil.h zlib.h zconf.h diff --git a/packages/zlib/zlib-1.2.3/libtool_staging.patch b/packages/zlib/zlib-1.2.3/libtool_staging.patch deleted file mode 100644 index f52e036108..0000000000 --- a/packages/zlib/zlib-1.2.3/libtool_staging.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- zlib-1.2.3/Makefile.in.sav 2006-06-13 09:09:53.000000000 -0600 -+++ zlib-1.2.3/Makefile.in 2006-06-13 09:24:48.861200464 -0600 -@@ -24,11 +24,13 @@ - #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ - # -Wstrict-prototypes -Wmissing-prototypes - -+LIBTOOL=libtool - LDFLAGS=libz.a - LDSHARED=$(CC) - CPP=$(CC) -E - - LIBS=libz.a -+LIBTOOLLIB=libz.la - SHAREDLIB=libz.so - SHAREDLIBV=libz.so.1.2.3 - SHAREDLIBM=libz.so.1 -@@ -67,7 +69,10 @@ - echo ' *** zlib test FAILED ***'; \ - fi - --libz.a: $(OBJS) $(OBJA) -+$(LIBTOOLLIB): $(OBJS) $(OBJA) -+ $(LIBTOOL) --tag='CC' --mode=link $(CC) -o $@ $(OBJS) $(OBJA) -+ -+libz.a: $(OBJS) $(OBJA) $(LIBTOOLLIB) - $(AR) $@ $(OBJS) $(OBJA) - -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 - diff --git a/packages/zlib/zlib-1.2.3/sane-target.patch b/packages/zlib/zlib-1.2.3/sane-target.patch deleted file mode 100644 index bacdd031af..0000000000 --- a/packages/zlib/zlib-1.2.3/sane-target.patch +++ /dev/null @@ -1,38 +0,0 @@ -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_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb index 8a48a89fdf..507b32eff9 100644 --- a/packages/zlib/zlib_1.2.3.bb +++ b/packages/zlib/zlib_1.2.3.bb @@ -1,39 +1,24 @@ DESCRIPTION = "Zlib Compression Library" SECTION = "libs" PRIORITY = "required" -MAINTAINER = "Chris Larson " +MAINTAINER = "Henning Heinold " HOMEPAGE = "http://www.gzip.org/zlib/" LICENSE = "zlib" +PR="r1" SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ file://visibility.patch;patch=1 \ - file://libtool_staging.patch;patch=1 \ - file://sane-target.patch;patch=1 " + file://autotools.patch;patch=1 " S = "${WORKDIR}/zlib-${PV}" DEPENDS = "libtool-cross" -export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1" -LDFLAGS_append = " -L. -lz" -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} ${ZLIB_EXTRA} - oe_runmake -e MAKEFLAGS="" ${ZLIB_SHARED} libz.a -} +inherit autotools do_stage() { install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h - - mv libz.la ${STAGING_LIBDIR}/ oe_libinstall -a -so libz ${STAGING_LIBDIR} } -- cgit v1.2.3 From 897d85c53389e1926cdb37bafce1cf77ebbd3b62 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 7 Aug 2006 21:26:13 +0000 Subject: zli/zlib-native_1.2.3.bb: after switching zlib to autotools the darwin hack isn't needed anymore, thanks zecke for testing --- packages/zlib/zlib-native_1.2.3.bb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/zlib/zlib-native_1.2.3.bb b/packages/zlib/zlib-native_1.2.3.bb index c7defb6aac..1716707148 100644 --- a/packages/zlib/zlib-native_1.2.3.bb +++ b/packages/zlib/zlib-native_1.2.3.bb @@ -5,12 +5,3 @@ 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 -} -- cgit v1.2.3 From e1aa79108dc9335cee9aab3d0e5d60e8de473c46 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 Aug 2006 22:11:18 +0000 Subject: task-angstrom: ship missing pcmciautils, spotted by zeenix --- packages/angstrom/task-angstrom.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index 1d4e826814..2f1aa23ee8 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r14" +PR = "r15" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -8,6 +8,7 @@ BOOTMODULES_RRECOMMENDS ?= "" DEBUG_APPS ?= "" DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace gdb procps",d)}' EXTRA_STUFF ?= "" +PCMCIA_MANAGER ?= "pcmciautils" PACKAGES = "\ angstrom-base-depends \ @@ -36,6 +37,7 @@ RDEPENDS_angstrom-base-depends = "\ tslib-tests tslib-calibrate \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ + ${PCMCIA_MANAGER} \ " RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware " -- cgit v1.2.3 From d9894509a7e38a1259feb1963388d6c22d2fe62a Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 8 Aug 2006 11:51:32 +0000 Subject: gtk+_2.10.1.bb : rediff and re-add the no-demos patch --- packages/gtk+/gtk+-2.10.1/no-demos.patch | 10 +++++----- packages/gtk+/gtk+_2.10.1.bb | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/gtk+/gtk+-2.10.1/no-demos.patch b/packages/gtk+/gtk+-2.10.1/no-demos.patch index 2f10a30dda..0fc4c48d1a 100644 --- a/packages/gtk+/gtk+-2.10.1/no-demos.patch +++ b/packages/gtk+/gtk+-2.10.1/no-demos.patch @@ -1,10 +1,10 @@ ---- gtk+-2.4.1/Makefile.am~ 2004-01-17 22:15:56.000000000 +0000 -+++ gtk+-2.4.1/Makefile.am 2004-05-08 12:25:32.000000000 +0100 +--- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 ++++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 @@ -1,6 +1,6 @@ ## Makefile.am for GTK+ --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros # require automake 1.4 diff --git a/packages/gtk+/gtk+_2.10.1.bb b/packages/gtk+/gtk+_2.10.1.bb index 4d2d18bbf4..401583987e 100644 --- a/packages/gtk+/gtk+_2.10.1.bb +++ b/packages/gtk+/gtk+_2.10.1.bb @@ -23,8 +23,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://migration.patch;patch=1;pnum=0 \ file://run-iconcache.patch;patch=1 \ file://disable-print.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1" -# file://no-demos.patch;patch=1 + file://hardcoded_libtool.patch;patch=1 \ + file://no-demos.patch;patch=1" # file://gtk+-handhelds.patch;patch=1 # file://single-click.patch;patch=1 # file://spinbutton.patch;patch=1 \ -- cgit v1.2.3