diff options
Diffstat (limited to 'packages')
18 files changed, 348 insertions, 44 deletions
diff --git a/packages/bzip2/bzip2-full-native-1.0.5/.mtn2git_empty b/packages/bzip2/bzip2-full-native-1.0.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/bzip2/bzip2-full-native-1.0.5/.mtn2git_empty diff --git a/packages/bzip2/bzip2-full-native-1.0.5/Makefile.am b/packages/bzip2/bzip2-full-native-1.0.5/Makefile.am new file mode 100644 index 0000000000..b234e80f37 --- /dev/null +++ b/packages/bzip2/bzip2-full-native-1.0.5/Makefile.am @@ -0,0 +1,41 @@ + +lib_LTLIBRARIES = libbz2.la + +libbz2_la_SOURCES = blocksort.c \ + huffman.c \ + crctable.c \ + randtable.c \ + compress.c \ + decompress.c \ + bzlib.c + +bin_PROGRAMS = bzip2 bzip2recover + +bzip2_SOURCES = bzip2.c +bzip2_LDADD = libbz2.la +bzip2_DEPENDENCIES = libbz2.la + +include_HEADERS = bzlib.h + +bzip2recover_SOURCES = bzip2recover.c +bzip2recover_LDADD = libbz2.la +bzip2recover_DEPENDENCIES = libbz2.la + +bin_SCRIPTS = bzgrep bzgrep bzmore bzdiff + +man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1 +EXTRA_DIST = $(man_MANS) + +install-exec-hook: + ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bunzip2$(EXEEXT) + ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bzcat$(EXEEXT) + ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzegrep$(EXEEXT) + ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzfgrep$(EXEEXT) + ln -s $(bindir)/bzmore$(EXEEXT) $(DESTDIR)$(bindir)/bzless$(EXEEXT) + ln -s $(bindir)/bzdiff$(EXEEXT) $(DESTDIR)$(bindir)/bzcmp$(EXEEXT) + +install-data-hook: + echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzegrep.1 + echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzfgrep.1 + echo ".so man1/bzmore.1" > $(DESTDIR)$(mandir)/man1/bzless.1 + echo ".so man1/bzdiff.1" > $(DESTDIR)$(mandir)/man1/bzcmp.1 diff --git a/packages/bzip2/bzip2-full-native-1.0.5/configure.ac b/packages/bzip2/bzip2-full-native-1.0.5/configure.ac new file mode 100644 index 0000000000..14b1d1809d --- /dev/null +++ b/packages/bzip2/bzip2-full-native-1.0.5/configure.ac @@ -0,0 +1,14 @@ +AC_PREREQ([2.57]) + +AC_INIT(bzip2, 2.0.5, , libXrender) +AM_INIT_AUTOMAKE() +AM_MAINTAINER_MODE + +#AM_CONFIG_HEADER(config.h) + +# Check for progs +AC_PROG_CC +AC_PROG_LIBTOOL + +AC_OUTPUT([Makefile]) + diff --git a/packages/bzip2/bzip2-full-native_1.0.5.bb b/packages/bzip2/bzip2-full-native_1.0.5.bb new file mode 100644 index 0000000000..13bebbb3d5 --- /dev/null +++ b/packages/bzip2/bzip2-full-native_1.0.5.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Very high-quality data compression program." +SECTION = "console/utils" +PR = "r0" + +LICENSE = "bzip2" +SRC_URI = "http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz \ + file://configure.ac \ + file://Makefile.am" + +S = "${WORKDIR}/bzip2-${PV}" + +CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64" + +inherit autotools native + +do_configure_prepend () { + cp ${WORKDIR}/configure.ac ${S}/ + cp ${WORKDIR}/Makefile.am ${S}/ + cp ${STAGING_DATADIR_NATIVE}/automake*/install-sh ${S}/ +} + +do_stage () { + install -m 0644 bzlib.h ${STAGING_INCDIR}/ + oe_libinstall -a -so libbz2 ${STAGING_LIBDIR} +} diff --git a/packages/dbus/dbus-1.0.3/0001-Make-the-default-DBus-reply-timeout-configurable.patch b/packages/dbus/dbus-1.0.3/0001-Make-the-default-DBus-reply-timeout-configurable.patch new file mode 100644 index 0000000000..a38e3db0de --- /dev/null +++ b/packages/dbus/dbus-1.0.3/0001-Make-the-default-DBus-reply-timeout-configurable.patch @@ -0,0 +1,78 @@ +From fb546488e93a1638d377b228bbb0d2ab58462168 Mon Sep 17 00:00:00 2001 +From: Daniel Willmann <daniel@totalueberwachung.de> +Date: Thu, 2 Oct 2008 15:50:17 +0800 +Subject: [PATCH] Make the default DBus reply timeout configurable + +This patch adds an option --with-dbus-default-reply-timeout to configure +that will set the default reply timeout used by libdbus in milliseconds. +autoconf and autoheader need to be rerun in order to regenerate the +correct configure and config.h.in files. +--- + configure.in | 9 +++++++++ + dbus/dbus-connection-internal.h | 3 --- + dbus/dbus-pending-call.c | 1 + + 3 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index 62ac387..5c912d7 100644 +--- a/configure.in ++++ b/configure.in +@@ -88,6 +88,7 @@ AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]] + AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner])) + AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)])) + AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon])) ++AC_ARG_WITH(dbus_default_reply_timeout, AS_HELP_STRING([--with-dbus-default-reply-timeout=[milliseconds]],[Default reply timeout for DBus method calls])) + + AC_DEFINE(DBUS_UNIX,1,[dbus on unix]) + +@@ -986,6 +987,13 @@ if test x$have_libaudit = xyes ; then + AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support]) + fi + ++if test -z "$with_dbus_default_reply_timeout" ; then ++ DBUS_DEFAULT_REPLY_TIMEOUT=25000 ++else ++ DBUS_DEFAULT_REPLY_TIMEOUT=$with_dbus_default_reply_timeout ++fi ++AC_DEFINE_UNQUOTED(_DBUS_DEFAULT_TIMEOUT_VALUE,$DBUS_DEFAULT_REPLY_TIMEOUT,[default timeout value for dbus calls]) ++ + #### Set up final flags + DBUS_CLIENT_CFLAGS= + DBUS_CLIENT_LIBS="$THREAD_LIBS" +@@ -1348,6 +1356,7 @@ echo " + Gettext libs (empty OK): ${INTLLIBS} + Using XML parser: ${with_xml} + Init scripts style: ${with_init_scripts} ++ Default reply timeout: ${DBUS_DEFAULT_REPLY_TIMEOUT} + Abstract socket names: ${ac_cv_have_abstract_sockets} + System bus socket: ${DBUS_SYSTEM_SOCKET} + System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} +diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h +index df54412..5fe536b 100644 +--- a/dbus/dbus-connection-internal.h ++++ b/dbus/dbus-connection-internal.h +@@ -41,9 +41,6 @@ typedef enum + DBUS_ITERATION_BLOCK = 1 << 2 /**< Block if nothing to do. */ + } DBusIterationFlags; + +-/** default timeout value when waiting for a message reply, 25 seconds */ +-#define _DBUS_DEFAULT_TIMEOUT_VALUE (25 * 1000) +- + void _dbus_connection_lock (DBusConnection *connection); + void _dbus_connection_unlock (DBusConnection *connection); + DBusConnection * _dbus_connection_ref_unlocked (DBusConnection *connection); +diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c +index 51b9378..5a7a5f4 100644 +--- a/dbus/dbus-pending-call.c ++++ b/dbus/dbus-pending-call.c +@@ -21,6 +21,7 @@ + * + */ + ++#include <config.h> + #include "dbus-internals.h" + #include "dbus-connection-internal.h" + #include "dbus-pending-call-internal.h" +-- +1.5.6.4 + diff --git a/packages/dbus/dbus-1.0.3/sanitize-reply-timeout.patch b/packages/dbus/dbus-1.0.3/sanitize-reply-timeout.patch deleted file mode 100644 index 75ee6bdd6a..0000000000 --- a/packages/dbus/dbus-1.0.3/sanitize-reply-timeout.patch +++ /dev/null @@ -1,16 +0,0 @@ -# DBus is from the desktop world, systems are _FAST_ there -# On Embedded, some things might take a bit longer -# Default session bus timeout is 300 seconds(!), whereas default -# system bus timeout is only 25 seconds. This increases it to 60. -# Signed off: Michael 'Mickey' Lauer <mlauer@vanille-media.de> -Index: dbus-1.2.1/bus/system.conf -=================================================================== ---- dbus-1.2.1.orig/bus/system.conf.in -+++ dbus-1.2.1/bus/system.conf.in -@@ -65,4 +65,6 @@ - - <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> - -+ <limit name="reply_timeout">60000</limit> -+ - </busconfig> diff --git a/packages/dbus/dbus-1.2.1/0001-Make-the-default-DBus-reply-timeout-configurable.patch b/packages/dbus/dbus-1.2.1/0001-Make-the-default-DBus-reply-timeout-configurable.patch new file mode 100644 index 0000000000..a38e3db0de --- /dev/null +++ b/packages/dbus/dbus-1.2.1/0001-Make-the-default-DBus-reply-timeout-configurable.patch @@ -0,0 +1,78 @@ +From fb546488e93a1638d377b228bbb0d2ab58462168 Mon Sep 17 00:00:00 2001 +From: Daniel Willmann <daniel@totalueberwachung.de> +Date: Thu, 2 Oct 2008 15:50:17 +0800 +Subject: [PATCH] Make the default DBus reply timeout configurable + +This patch adds an option --with-dbus-default-reply-timeout to configure +that will set the default reply timeout used by libdbus in milliseconds. +autoconf and autoheader need to be rerun in order to regenerate the +correct configure and config.h.in files. +--- + configure.in | 9 +++++++++ + dbus/dbus-connection-internal.h | 3 --- + dbus/dbus-pending-call.c | 1 + + 3 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index 62ac387..5c912d7 100644 +--- a/configure.in ++++ b/configure.in +@@ -88,6 +88,7 @@ AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]] + AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner])) + AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)])) + AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon])) ++AC_ARG_WITH(dbus_default_reply_timeout, AS_HELP_STRING([--with-dbus-default-reply-timeout=[milliseconds]],[Default reply timeout for DBus method calls])) + + AC_DEFINE(DBUS_UNIX,1,[dbus on unix]) + +@@ -986,6 +987,13 @@ if test x$have_libaudit = xyes ; then + AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support]) + fi + ++if test -z "$with_dbus_default_reply_timeout" ; then ++ DBUS_DEFAULT_REPLY_TIMEOUT=25000 ++else ++ DBUS_DEFAULT_REPLY_TIMEOUT=$with_dbus_default_reply_timeout ++fi ++AC_DEFINE_UNQUOTED(_DBUS_DEFAULT_TIMEOUT_VALUE,$DBUS_DEFAULT_REPLY_TIMEOUT,[default timeout value for dbus calls]) ++ + #### Set up final flags + DBUS_CLIENT_CFLAGS= + DBUS_CLIENT_LIBS="$THREAD_LIBS" +@@ -1348,6 +1356,7 @@ echo " + Gettext libs (empty OK): ${INTLLIBS} + Using XML parser: ${with_xml} + Init scripts style: ${with_init_scripts} ++ Default reply timeout: ${DBUS_DEFAULT_REPLY_TIMEOUT} + Abstract socket names: ${ac_cv_have_abstract_sockets} + System bus socket: ${DBUS_SYSTEM_SOCKET} + System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} +diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h +index df54412..5fe536b 100644 +--- a/dbus/dbus-connection-internal.h ++++ b/dbus/dbus-connection-internal.h +@@ -41,9 +41,6 @@ typedef enum + DBUS_ITERATION_BLOCK = 1 << 2 /**< Block if nothing to do. */ + } DBusIterationFlags; + +-/** default timeout value when waiting for a message reply, 25 seconds */ +-#define _DBUS_DEFAULT_TIMEOUT_VALUE (25 * 1000) +- + void _dbus_connection_lock (DBusConnection *connection); + void _dbus_connection_unlock (DBusConnection *connection); + DBusConnection * _dbus_connection_ref_unlocked (DBusConnection *connection); +diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c +index 51b9378..5a7a5f4 100644 +--- a/dbus/dbus-pending-call.c ++++ b/dbus/dbus-pending-call.c +@@ -21,6 +21,7 @@ + * + */ + ++#include <config.h> + #include "dbus-internals.h" + #include "dbus-connection-internal.h" + #include "dbus-pending-call-internal.h" +-- +1.5.6.4 + diff --git a/packages/dbus/dbus-1.2.1/sanitize-reply-timeout.patch b/packages/dbus/dbus-1.2.1/sanitize-reply-timeout.patch deleted file mode 100644 index 75ee6bdd6a..0000000000 --- a/packages/dbus/dbus-1.2.1/sanitize-reply-timeout.patch +++ /dev/null @@ -1,16 +0,0 @@ -# DBus is from the desktop world, systems are _FAST_ there -# On Embedded, some things might take a bit longer -# Default session bus timeout is 300 seconds(!), whereas default -# system bus timeout is only 25 seconds. This increases it to 60. -# Signed off: Michael 'Mickey' Lauer <mlauer@vanille-media.de> -Index: dbus-1.2.1/bus/system.conf -=================================================================== ---- dbus-1.2.1.orig/bus/system.conf.in -+++ dbus-1.2.1/bus/system.conf.in -@@ -65,4 +65,6 @@ - - <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> - -+ <limit name="reply_timeout">60000</limit> -+ - </busconfig> diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index d99fa26455..09e427a7ab 100644 --- a/packages/dbus/dbus.inc +++ b/packages/dbus/dbus.inc @@ -9,7 +9,7 @@ SRC_URI = "\ file://cross.patch;patch=1 \ file://tmpdir.patch;patch=1 \ file://fix-install-daemon.patch;patch=1 \ - file://sanitize-reply-timeout.patch;patch=1 \ + file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;patch=1 \ file://dbus-1.init \ " @@ -27,6 +27,7 @@ EXTRA_OECONF = "\ --disable-doxygen-docs \ --with-xml=expat \ --with-x \ + --with-dbus-default-reply-timeout=60000 \ " do_install_append() { diff --git a/packages/dbus/dbus_1.0.3.bb b/packages/dbus/dbus_1.0.3.bb index b3eca63491..b3768ceb1e 100644 --- a/packages/dbus/dbus_1.0.3.bb +++ b/packages/dbus/dbus_1.0.3.bb @@ -1,4 +1,4 @@ require dbus.inc -PR = "r13" +PR = "r14" DEFAULT_PREFERENCE = "-1" diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb index 4e4caaa78c..3f586ed12d 100644 --- a/packages/dbus/dbus_1.2.1.bb +++ b/packages/dbus/dbus_1.2.1.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r6" +PR = "r7" diff --git a/packages/gnome/gnome-games/.mtn2git_empty b/packages/gnome/gnome-games/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gnome/gnome-games/.mtn2git_empty diff --git a/packages/gnome/gnome-games/ggz-unbreak-m4.patch b/packages/gnome/gnome-games/ggz-unbreak-m4.patch new file mode 100644 index 0000000000..5f182cfc32 --- /dev/null +++ b/packages/gnome/gnome-games/ggz-unbreak-m4.patch @@ -0,0 +1,46 @@ +--- /tmp/ggz.m4 2008-09-27 09:57:44.000000000 +0200 ++++ ggz-client-libs-0.0.14.1/m4/ggz.m4 2008-09-27 10:06:02.000000000 +0200 +@@ -139,8 +139,8 @@ + ]) + + if test "x${prefix}" = "xNONE"; then +- ac_ggz_prefix_incdir="${ac_default_prefix}/include" +- ac_ggz_prefix_libdir="${ac_default_prefix}/lib" ++ ac_ggz_prefix_incdir="" ++ ac_ggz_prefix_libdir="" + ac_ggz_prefix_bindir="${ac_default_prefix}/bin" + ac_ggz_prefix_etcdir="${ac_default_prefix}/etc" + else +@@ -163,26 +163,22 @@ + ac_ggz_prefix_bindir="${unq_bindir}" + ac_ggz_prefix_etcdir="${unq_sysconfdir}" + fi +-ac_ggz_stdinc="$ac_ggz_prefix_incdir" +-ac_ggz_stdlib="$ac_ggz_prefix_libdir" ++ac_ggz_stdinc="" ++ac_ggz_stdlib="" + ac_ggz_stdbin="$ac_ggz_prefix_bindir" + ac_ggz_stdetc="$ac_ggz_prefix_etcdir/ggzd" + if test "x$ac_ggz_prefix" != "x"; then +- ac_ggz_stdinc="$ac_ggz_stdinc $ac_ggz_prefix/include" +- ac_ggz_stdlib="$ac_ggz_stdlib $ac_ggz_prefix/lib $ac_ggz_prefix/lib64" ++ ac_ggz_stdinc=" " ++ ac_ggz_stdlib=" " + ac_ggz_stdbin="$ac_ggz_stdbin $ac_ggz_prefix/bin" + ac_ggz_stdetc="$ac_ggz_stdetc $ac_ggz_prefix/etc/ggzd" + fi + if test "x$1" = "xdefaults" || test "x$2" = "xdefaults"; then +- ac_ggz_stdinc="$ac_ggz_stdinc /usr/local/include /usr/include" +- ac_ggz_stdlib="$ac_ggz_stdlib /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64" ++ ac_ggz_stdinc=" " ++ ac_ggz_stdlib=" " + ac_ggz_stdbin="$ac_ggz_stdbin /usr/local/bin /usr/bin" + ac_ggz_stdetc="$ac_ggz_stdetc /usr/local/etc/ggzd /etc/ggzd" + fi +-if test "x$1" = "xexport" || test "x$2" = "xexport"; then +- CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include" +- LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib" +-fi + + save_cflags=$CFLAGS + save_cxxflags=$CXXFLAGS diff --git a/packages/gnome/gnome-games_2.24.0.bb b/packages/gnome/gnome-games_2.24.0.bb index d849f4c0c5..d4e58da4e7 100644 --- a/packages/gnome/gnome-games_2.24.0.bb +++ b/packages/gnome/gnome-games_2.24.0.bb @@ -3,10 +3,15 @@ DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui l inherit gnome distutils-base gconf +PR = "r1" + +SRC_URI += "file://ggz-unbreak-m4.patch;patch=1 \ + " + EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \ --with-libggz-libraries=${STAGING_LIBDIR} \ --with-ggzmod-includes=${STAGING_INCDIR} \ - --with-ggzmod-libraries=${STAGING_LIBDIR} \ + --with-ggzmod-libraries=${STAGING_LIBDIR} \ --enable-scalable \ " @@ -22,6 +27,8 @@ do_configure_append() { done } +CFLAGS_append = " -lguile -lgmp -lcrypt -lm -lltdl" + FILES_${PN}-doc += " ${datadir}/gnome/help" FILES_${PN}-dbg += " ${bindir}/.debug ${libdir}/gnome-games/.debug" diff --git a/packages/guile/guile_1.8.5.bb b/packages/guile/guile_1.8.5.bb index 8cdd98c7d4..62fdedd44a 100644 --- a/packages/guile/guile_1.8.5.bb +++ b/packages/guile/guile_1.8.5.bb @@ -5,7 +5,7 @@ SECTION = "devel/scheme" DEPENDS = "guile-native gmp" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ file://configure-fix.patch;patch=1 " @@ -25,6 +25,9 @@ do_compile() { sed -i -e s:${STAGING_DIR_TARGET}::g \ -e s:/${TARGET_SYS}::g \ + -e s:-L/usr/lib::g \ + -e s:-isystem/usr/include::g \ + -e s:,/usr/lib:,\$\{libdir\}:g \ guile-1.8.pc } diff --git a/packages/python/python-native-2.5.1/fix-staging.patch b/packages/python/python-native-2.5.1/fix-staging.patch new file mode 100644 index 0000000000..087c813fd4 --- /dev/null +++ b/packages/python/python-native-2.5.1/fix-staging.patch @@ -0,0 +1,38 @@ +--- + Lib/distutils/sysconfig.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +--- Python-2.5.1.orig/Lib/distutils/sysconfig.py ++++ Python-2.5.1/Lib/distutils/sysconfig.py +@@ -52,11 +52,14 @@ def get_python_inc(plat_specific=0, pref + + If 'prefix' is supplied, use it instead of sys.prefix or + sys.exec_prefix -- i.e., ignore 'plat_specific'. + """ + if prefix is None: +- prefix = plat_specific and EXEC_PREFIX or PREFIX ++ if plat_specific: ++ prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include') ++ else: ++ prefix = plat_specific and EXEC_PREFIX or PREFIX + if os.name == "posix": + if python_build: + base = os.path.dirname(os.path.abspath(sys.executable)) + if plat_specific: + inc_dir = base +@@ -94,11 +97,14 @@ def get_python_lib(plat_specific=0, stan + + If 'prefix' is supplied, use it instead of sys.prefix or + sys.exec_prefix -- i.e., ignore 'plat_specific'. + """ + if prefix is None: +- prefix = plat_specific and EXEC_PREFIX or PREFIX ++ if plat_specific: ++ prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip('lib') ++ else: ++ prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": + libpython = os.path.join(prefix, + "lib", "python" + get_python_version()) + if standard_lib: diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb index 3f58d36a2e..d43cb520cb 100644 --- a/packages/python/python-native_2.5.1.bb +++ b/packages/python/python-native_2.5.1.bb @@ -1,10 +1,10 @@ DESCRIPTION = "The Python Programming Language" HOMEPAGE = "http://www.python.org" LICENSE = "PSF" +DEPENDS = "openssl-native bzip2-full-native" SECTION = "devel/python" PRIORITY = "optional" -DEPENDS = "" -PR = "ml2" +PR = "ml5" EXCLUDE_FROM_WORLD = "1" @@ -15,6 +15,7 @@ SRC_URI = "\ file://dont-modify-shebang-line.patch;patch=1 \ file://default-is-optimized.patch;patch=1 \ file://catchup-with-swig.patch;patch=1 \ + file://fix-staging.patch;patch=1 \ " S = "${WORKDIR}/Python-${PV}" @@ -25,7 +26,8 @@ exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}" EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ --without-cxx --with-signal-module --with-wctype-functions" -EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' +EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR}' do_stage_append() { install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/ diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc index 642adf874a..b2ffce4f48 100644 --- a/packages/qmake/qmake2-native.inc +++ b/packages/qmake/qmake2-native.inc @@ -18,7 +18,8 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \ S = "${WORKDIR}/${QTVER}" # we need the real target system here -CROSS_SYS := "${TARGET_SYS}" +CROSS_SYS := "${MULTIMACH_TARGET_SYS}" + inherit autotools export QTDIR = "${S}" @@ -53,7 +54,7 @@ do_configure() { export OE_QMAKE_RCC="non-existant" export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" export OE_QMAKE_RPATH="-Wl,-rpath-link," - echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" + echo yes | ./configure -prefix ${STAGING_DIR_TARGET}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" } do_compile() { @@ -61,8 +62,10 @@ do_compile() { } do_stage() { - install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 - install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2 + install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake-qt4 + install -d ${CROSS_DATADIR}/qt4 cp -PfR mkspecs ${CROSS_DATADIR}/qt4/ } |