diff options
| -rw-r--r-- | conf/distro/openzaurus.conf | 3 | ||||
| -rw-r--r-- | packages/libsigc++-1.2/libsigc++-1.2-1.2.7/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libsigc++-1.2/libsigc++-1.2-1.2.7/autofoo.patch | 126 | ||||
| -rw-r--r-- | packages/libsigc++-1.2/libsigc++-1.2-1.2.7/disable-tests.patch | 13 | ||||
| -rw-r--r-- | packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb | 30 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb | 5 |
6 files changed, 175 insertions, 2 deletions
diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf index f6975ae961..9208aeda09 100644 --- a/conf/distro/openzaurus.conf +++ b/conf/distro/openzaurus.conf @@ -7,3 +7,6 @@ INHERIT += " package_ipk debian" # TARGET_OS ?= "linux" TARGET_OS = "linux" TARGET_FPU = "soft" + +PARALLEL_INSTALL_MODULES = "1" + diff --git a/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/.mtn2git_empty b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/.mtn2git_empty diff --git a/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/autofoo.patch b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/autofoo.patch new file mode 100644 index 0000000000..a5f7063af7 --- /dev/null +++ b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/autofoo.patch @@ -0,0 +1,126 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libsigc++-1.2.7/configure.in~autofoo.patch ++++ libsigc++-1.2.7/configure.in +@@ -35,9 +35,9 @@ + dnl AC_SUBST(SIGC_RELEASE, $SIGC_RELEASE) + AC_SUBST(SIGC_VERSION) + +-AC_DEFINE_UNQUOTED(SIGC_MAJOR_VERSION, $SIGC_MAJOR_VERSION) +-AC_DEFINE_UNQUOTED(SIGC_MINOR_VERSION, $SIGC_MINOR_VERSION) +-AC_DEFINE_UNQUOTED(SIGC_MICRO_VERSION, $SIGC_MICRO_VERSION) ++AC_DEFINE_UNQUOTED(SIGC_MAJOR_VERSION, $SIGC_MAJOR_VERSION, [library major version]) ++AC_DEFINE_UNQUOTED(SIGC_MINOR_VERSION, $SIGC_MINOR_VERSION, [library minor version]) ++AC_DEFINE_UNQUOTED(SIGC_MICRO_VERSION, $SIGC_MICRO_VERSION, [library micro version]) + + AC_CONFIG_AUX_DIR(scripts) + +@@ -50,7 +50,23 @@ + + dnl Specify a configuration file + AM_CONFIG_HEADER(sigc++/config/sigcconfig.h) ++AH_BOTTOM([ ++// Window DLL declarations + ++#ifdef LIBSIGC_DLL ++ #if defined(LIBSIGC_COMPILATION) && defined(DLL_EXPORT) ++ #define LIBSIGC_API __declspec(dllexport) ++ #define LIBSIGC_TMPL ++ #elif !defined(LIBSIGC_COMPILATION) ++ #define LIBSIGC_API __declspec(dllimport) ++ #define LIBSIGC_TMPL extern ++ #else ++ #define LIBSIGC_API ++ #endif /* LIBSIGC_COMPILATION - DLL_EXPORT */ ++#else ++ #define LIBSIGC_API ++#endif /* LIBSIGC_DLL */ ++]) + AM_MAINTAINER_MODE + + # echo $USE_MAINTAINER_MODE +@@ -288,7 +304,7 @@ + }; + ],[ + ], +- AC_DEFINE(SIGC_CXX_EXPLICIT,explicit) ++ AC_DEFINE(SIGC_CXX_EXPLICIT,explicit,[if C++ compiler supports explicit]) + ac_cxx_explicit=yes + , + AC_DEFINE(SIGC_CXX_EXPLICIT,) +@@ -305,7 +321,7 @@ + }; + ],[ + ], +- AC_DEFINE(SIGC_CXX_EXPLICIT_COPY,explicit) ++ AC_DEFINE(SIGC_CXX_EXPLICIT_COPY,explicit,[if C++ compiler supports explicit copy ctor]) + ac_cxx_explicit_copy_ctor=yes + , + AC_DEFINE(SIGC_CXX_EXPLICIT_COPY,) +@@ -413,7 +429,7 @@ + k<void,void> a; + ],[ + ac_cxx_partial_specialization=yes +- AC_DEFINE(SIGC_CXX_PARTIAL_SPEC) ++ AC_DEFINE(SIGC_CXX_PARTIAL_SPEC,[if C++ compiler supports partial specialization]) + ],[ + # config_error=yes + ac_cxx_partial_specialization=no +@@ -434,7 +450,7 @@ + ],[ + ac_cxx_namespaces=yes + AC_MSG_RESULT([$ac_cxx_namespaces]) +- AC_DEFINE(SIGC_CXX_NAMESPACES) ++ AC_DEFINE(SIGC_CXX_NAMESPACES,,[if C++ compiler supports name spaces]) + ],[ + ac_cxx_namespaces=no + AC_MSG_RESULT([$ac_cxx_namespaces]) +@@ -474,7 +490,7 @@ + A<int> i; + ],[ + ],[ +- AC_DEFINE(SIGC_CXX_INT_CTOR) ++ AC_DEFINE(SIGC_CXX_INT_CTOR,,[if C++ compiler has intrinsic constructors]) + ac_cxx_tmpl_intctor=yes + ],[ + ac_cxx_tmpl_intctor=no +@@ -515,7 +531,7 @@ + ],[ + ],[ + ac_cxx_void_return=yes +- AC_DEFINE(SIGC_CXX_VOID_RETURN) ++ AC_DEFINE(SIGC_CXX_VOID_RETURN,,[if C++ compiler allows void returns]) + ],[ + ac_cxx_void_return=no + ]) +@@ -530,7 +546,7 @@ + ],[ + ],[ + ac_cxx_void_cast_return=yes +- AC_DEFINE(SIGC_CXX_VOID_CAST_RETURN) ++ AC_DEFINE(SIGC_CXX_VOID_CAST_RETURN,,[if C++ compiler supports void cast return]) + ],[ + ac_cxx_void_cast_return=no + ]) +@@ -565,7 +581,7 @@ + P<int&>::ptr q=b; + ],[ + ac_cxx_specialize_references=yes +- AC_DEFINE(SIGC_CXX_SPECIALIZE_REFERENCES) ++ AC_DEFINE(SIGC_CXX_SPECIALIZE_REFERENCES,,[if C++ compiler allows specialization of references]) + ],[ + ac_cxx_specialize_references=no + ]) +--- libsigc++-1.2.7/Makefile.am~autofoo.patch ++++ libsigc++-1.2.7/Makefile.am +@@ -1,6 +1,6 @@ + SUBDIRS = sigc++ tests doc MSVC_6 MSVC_Net2003 eVC4 + DIST_SUBDIRS = $(SUBDIRS) examples scripts +-ACLOCAL_AMFLAGS = -I $(srcdir)/scripts ++ACLOCAL_AMFLAGS = -I ./scripts + + EXTRA_DIST = \ + FEATURES IDEAS \ diff --git a/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/disable-tests.patch b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/disable-tests.patch new file mode 100644 index 0000000000..92145a4ec9 --- /dev/null +++ b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/disable-tests.patch @@ -0,0 +1,13 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libsigc++-1.2.7/Makefile.am~disable-tests ++++ libsigc++-1.2.7/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = sigc++ tests doc MSVC_6 MSVC_Net2003 eVC4 ++SUBDIRS = sigc++ + DIST_SUBDIRS = $(SUBDIRS) examples scripts + ACLOCAL_AMFLAGS = -I ./scripts + diff --git a/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb b/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb new file mode 100644 index 0000000000..75e830fd2b --- /dev/null +++ b/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "A library for loose coupling of C++ method calls" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL LGPL" +PR = "r0" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1 \ + file://disable-tests.patch;patch=1" +S = "${WORKDIR}/libsigc++-${PV}" + +inherit autotools pkgconfig + +# FIXME: Check why tests don't compile + +acpaths = "" + +do_stage() { + install -d ${STAGING_LIBDIR}/sigc++-1.2/include + install -m 0644 sigc++/config/sigcconfig.h ${STAGING_LIBDIR}/sigc++-1.2/include/ + oe_libinstall -so -C sigc++ libsigc-1.2 ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/sigc++-1.2/sigc++ + for f in sigc++/*.h + do + install -m 0644 $f ${STAGING_INCDIR}/sigc++-1.2/sigc++/ + done +} + +FILES_${PN}-dev += "${libdir}/sigc++-*/" diff --git a/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb index 9df141ed44..c726d24793 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r0" +PR = "r1" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -37,6 +37,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/reverse_pagefault-r1.patch;patch=1 \ ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \ ${RPSRC}/oprofile_typo-r0.patch;patch=1 \ + ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \ ${RPSRC}/mmc_bytefix-r0.patch;patch=1 \ ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \ ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \ @@ -74,7 +75,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-udc-r3.patch;patch=1 \ ${DOSRC}/tosa-irda-r2.patch;patch=1 \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ - ${DOSRC}/tosa-2.6.13-r2.patch;patch=1 \ + ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ file://add-oz-release-string.patch;patch=1 \ |