summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/feed-browser/includes/functions.inc60
-rw-r--r--contrib/feed-browser/index.php75
-rw-r--r--contrib/feed-browser/update.php9
-rw-r--r--packages/gaim/pidgin.inc3
-rw-r--r--packages/gaim/pidgin_2.0.2.bb2
-rw-r--r--packages/gtkhtml/gtkhtml-3.6/.mtn2git_empty0
-rw-r--r--packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch25
-rw-r--r--packages/gtkhtml/gtkhtml-3.6_3.6.2.bb4
-rw-r--r--packages/libtool/libtool-1.5.10/rpath-control.patch21
-rw-r--r--packages/libtool/libtool-cross_1.5.10.bb5
-rw-r--r--packages/libtool/libtool-native_1.5.10.bb5
-rw-r--r--packages/perl/perl-5.8.8/asm-pageh-fix.patch19
-rw-r--r--packages/perl/perl-5.8.8/makedepend-dash.patch (renamed from packages/perl/perl-5.8.8/native-makedepend-dash.patch)0
-rw-r--r--packages/perl/perl-native_5.8.8.bb8
-rw-r--r--packages/perl/perl_5.8.8.bb16
-rw-r--r--packages/qemu/qemu-native.inc2
-rw-r--r--packages/qt/qt4_arch.inc2
17 files changed, 189 insertions, 67 deletions
diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc
index 2532dd7c08..8b64ca345b 100644
--- a/contrib/feed-browser/includes/functions.inc
+++ b/contrib/feed-browser/includes/functions.inc
@@ -1,7 +1,7 @@
<?php
/*
- * (c) Koen Kooi 2006
- * (c) Marcin Juszkiewicz 2006
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
@@ -112,18 +112,27 @@ function searchletter($searchletter = '')
}
else
{
- $ipkgoutput .= sprintf(" <a href='?action=letter&amp;g=%s' title='packages which names begins with \"%s\"'>%s</a> |", $letter, $letter, $letter );
+ $ipkgoutput .= sprintf(" <a href='?letter=%s' title='packages which names begins with \"%s\"'>%s</a> |", $letter, $letter, $letter );
}
}
- $ipkgoutput .= " <a href='?action=letter&amp;g=z' title='packages which names begins with \"z\"'>z</a></div>";
+ $ipkgoutput .= " <a href='?letter=z' title='packages which names begins with \"z\"'>z</a></div>";
return $ipkgoutput;
}
-function searchpkg ($searchword)
+function searchpkg ($searchword, $searcharch = '')
{
- if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' ORDER BY p_name ASC"))
+ $query = "SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' ";
+
+ if(!empty($searcharch))
+ {
+ $query .= " AND p_arch='{$searcharch}' ";
+ }
+
+ $query .= 'ORDER BY p_name ASC';
+
+ if($result = db_query($query))
{
return generate_list_of_packages($result);
}
@@ -149,7 +158,7 @@ function generate_list_of_packages($query_result)
}
$ipkgoutput .= sprintf
- ("<tr><td><a href='?action=details&amp;pnm=%s'>%s</a></td><td><a href=\"?action=section&amp;section=%s\">%s</a></td><td> %s</td></tr>\n",
+ ("<tr><td><a href='?pkgname=%s'>%s</a></td><td><a href=\"?section=%s\">%s</a></td><td> %s</td></tr>\n",
urlencode($package['p_name']), $package['p_name'], $package['p_section'], $package['p_section'], htmlentities($package['p_desc']));
}
@@ -173,7 +182,7 @@ function pkgdetails ($package)
$result = db_query("SELECT * FROM packages,feeds
WHERE (packages.p_name='$package' OR packages.p_provides='$package')
AND feeds.f_id = packages.p_feed
- ORDER BY packages.p_version DESC, feeds.f_name ASC, packages.p_arch DESC ");
+ ORDER BY packages.p_version DESC, packages.p_arch ASC ");
// display first result
@@ -194,7 +203,7 @@ function pkgdetails ($package)
if($package['packages.p_section'])
{
- $details .= sprintf ("\n<dt>Section:</dt><dd><a href='?action=section&amp;section=%s'>%s</a></dd>", $package['packages.p_section'],$package['packages.p_section']);
+ $details .= sprintf ("\n<dt>Section:</dt><dd><a href='?section=%s'>%s</a></dd>", $package['packages.p_section'],$package['packages.p_section']);
}
if($package['packages.p_depends'])
@@ -310,7 +319,7 @@ function addlinks ($input)
{
// find position of string in line
$pos = strpos ($input, $element, $offset);
- $link = sprintf("<a href=\"?action=details&amp;pnm=%s\">$element</a>", urlencode ($element));
+ $link = sprintf("<a href=\"?pkgname=%s\">$element</a>", urlencode ($element));
// replace element with a link
$input = substr_replace ($input, $link, $pos, strlen ($element));
@@ -361,7 +370,7 @@ function sectionslist()
foreach($sections as $section_name1=>$item)
{
- $output .= sprintf ("<li><a href='?action=section&amp;section=%s' title='%s'>%s</a>",
+ $output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a>",
urlencode($section_name1),
urlencode($section_name1),
$section_name1);
@@ -373,7 +382,7 @@ function sectionslist()
foreach($item as $section_name2=>$subitem)
{
$section_name = "{$section_name1}/{$section_name2}";
- $output .= sprintf ("<li><a href='?action=section&amp;section=%s' title='%s'>%s</a>",
+ $output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a>",
urlencode($section_name),
urlencode($section_name),
$section_name2);
@@ -385,7 +394,7 @@ function sectionslist()
foreach($subitem as $section_name3=>$subitem2)
{
$section_name = "{$section_name1}/{$section_name2}/{$section_name3}";
- $output .= sprintf ("<li><a href='?action=section&amp;section=%s' title='%s'>%s</a></li>",
+ $output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a></li>",
urlencode($section_name),
urlencode($section_name),
$section_name3);
@@ -411,8 +420,12 @@ function sectionslist()
function check_database()
{
- if($db = sqlite_open(DB_FILENAME))
+ $db_exists = FALSE;
+
+ if(file_exists(DB_FILENAME) AND $db = sqlite_open(DB_FILENAME))
{
+ $db_exists = TRUE;
+
//initialize db
if (db_table_exists ($db, 'packages') === FALSE)
{
@@ -443,15 +456,32 @@ function check_database()
f_name varchar(32),
f_uri varchar(100),
f_type varchar(16)
- )");
+ f_comments varchar(500))");
insert_feeds ($db) ;
}
sqlite_close($db);
}
+
+ return $db_exists;
}
+function read_vars_from_get($array_of_vars)
+{
+ foreach($array_of_vars as $name_of_var)
+ {
+ $GLOBALS[$name_of_var] = '';
+ if(isset($_GET[$name_of_var]))
+ {
+ $GLOBALS[$name_of_var] = $_GET[$name_of_var];
+ }
+ }
+}
+function get_arch_list()
+{
+ return db_query('SELECT DISTINCT p_arch FROM packages WHERE p_arch NOT IN (NULL, "", "all") ORDER BY p_arch ASC');
+}
?>
diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php
index 1c902ac66e..eca57e9269 100644
--- a/contrib/feed-browser/index.php
+++ b/contrib/feed-browser/index.php
@@ -1,8 +1,8 @@
<?php
/*
- * (c) Koen Kooi 2006
- * (c) Marcin Juszkiewicz 2006
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
*
* This php script is intended to do the following:
*
@@ -33,45 +33,33 @@
require_once 'includes/config.inc';
require_once 'includes/functions.inc';
-check_database();
-
-$name = '';
-
-if(isset($_GET['name']))
+if(!check_database())
{
- $name = $_GET['name'];
+ die("Database not found and cannot be created.");
}
-$action = '';
+read_vars_from_get(array('name', 'arch', 'pkgsearch', 'letter', 'pkgname', 'section'));
+
+$ipkgoutput = '';
-if(isset($_GET['action']))
+if(!empty($section))
{
- $action = $_GET['action'];
+ $ipkgoutput = searchsection($section);
}
-
-switch($action)
+elseif(!empty($letter))
{
- case "details":
- $ipkgoutput = pkgdetails ($_GET['pnm']);
- break;
-
- case "search":
- $ipkgoutput = searchpkg ("%{$name}%");
- break;
-
- case "section":
- $ipkgoutput = searchsection($_GET['section']);
- break;
-
- case "letter":
- $letter = $_GET['g'];
- $ipkgoutput = searchpkg ("{$letter}%");
- break;
-
- default:
- $ipkgoutput = searchpkg("a");
- break;
+ $ipkgoutput = searchpkg("{$letter}%", $arch);
+}
+elseif(!empty($pkgname))
+{
+ $ipkgoutput = pkgdetails($pkgname);
}
+elseif(!empty($pkgsearch) OR !empty($arch))
+{
+ $ipkgoutput = searchpkg("%{$pkgsearch}%", $arch);
+}
+
+$archs_list = get_arch_list();
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -88,8 +76,25 @@ switch($action)
<form action="" method="get">
<fieldset>
<label for="name">Package name</label>
- <input type="text" name="name" value="<?php echo $name; ?>" />
- <input type="hidden" name="action" value="search" />
+ <input type="text" name="pkgsearch" value="<?php echo $pkgsearch; ?>" />
+ <select name="arch">
+ <option value="" selected="selected">all architectures</option>
+ <option value="all">no arch</option>
+<?php
+
+foreach($archs_list as $architecture)
+{
+ echo "<option value='{$architecture['p_arch']}'";
+
+ if($architecture['p_arch'] == $arch)
+ {
+ echo ' selected="selected"';
+ }
+ echo ">{$architecture['p_arch']}</option>";
+}
+
+?>
+ </select>
<input type="submit" value="Search" />
</fieldset>
</form>
diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php
index ed67d3b78a..53317ebb03 100644
--- a/contrib/feed-browser/update.php
+++ b/contrib/feed-browser/update.php
@@ -1,5 +1,7 @@
<?php
-/* (c) Koen Kooi 2006
+/*
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
@@ -37,7 +39,10 @@ require_once 'includes/functions.inc';
Description: IPv4 link-local address allocator
*/
-check_database();
+if(!check_database())
+{
+ die("Database not found and cannot be created.");
+}
$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
diff --git a/packages/gaim/pidgin.inc b/packages/gaim/pidgin.inc
index 64eb6bd143..bb2daf2314 100644
--- a/packages/gaim/pidgin.inc
+++ b/packages/gaim/pidgin.inc
@@ -19,6 +19,9 @@ EXTRA_OECONF = " \
--with-gnutls-libs=${STAGING_LIBDIR} \
"
+OE_LT_RPATH_ALLOW=":${libdir}/purple-2:"
+OE_LT_RPATH_ALLOW[export]="1"
+
PACKAGES =+ "libpurple libpurple-dev libpurple-dbg libpurple-liboscar libpurple-libjabber libpurple-logreader finch finch-dev finch-dbg"
diff --git a/packages/gaim/pidgin_2.0.2.bb b/packages/gaim/pidgin_2.0.2.bb
index e0f865722e..2cc02c5072 100644
--- a/packages/gaim/pidgin_2.0.2.bb
+++ b/packages/gaim/pidgin_2.0.2.bb
@@ -6,4 +6,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
file://pidgin.desktop-set-icon.patch;patch=1 \
"
-PR = "r0"
+PR = "r1"
diff --git a/packages/gtkhtml/gtkhtml-3.6/.mtn2git_empty b/packages/gtkhtml/gtkhtml-3.6/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtkhtml/gtkhtml-3.6/.mtn2git_empty
diff --git a/packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch b/packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch
new file mode 100644
index 0000000000..f69b0f3421
--- /dev/null
+++ b/packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch
@@ -0,0 +1,25 @@
+diff --git a/components/html-editor/Makefile.am b/components/html-editor/Makefile.am
+index 7fda5ae..925e409 100644
+--- a/components/html-editor/Makefile.am
++++ b/components/html-editor/Makefile.am
+@@ -5,7 +5,7 @@ gtkhtml_data = $(datadir)/gtkhtml-@GTKHTML_API_VERSION@
+ gladedir = $(gtkhtml_data)
+ glade_DATA = gtkhtml-editor-properties.glade
+
+-INCLUDES = -I$(top_srcdir)/src -I$(srcdir) -I$(includedir) $(GTKHTML_CFLAGS) $(SOUP_CFLAGS) \
++INCLUDES = -I$(top_srcdir)/src -I$(srcdir) $(GTKHTML_CFLAGS) $(SOUP_CFLAGS) \
+ -DG_LOG_DOMAIN=\"gtkhtml\" \
+ -DSRCDIR=\"$(srcdir)\" \
+ -DPREFIX=\"$(prefix)\"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f76178f..2d70183 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,7 +3,6 @@ NULL=
+ INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(srcdir) \
+- -I$(includedir) \
+ $(GTKHTML_CFLAGS) \
+ $(SOUP_CFLAGS) \
+ -DG_LOG_DOMAIN=\"gtkhtml\" \
diff --git a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
index fd5fde49ed..cb2b8b2acc 100644
--- a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
+++ b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
@@ -2,7 +2,9 @@ require gtkhtml.inc
DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
-SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2"
+SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2 \
+ file://cross-includedir.patch;patch=1"
+PR = "r1"
FILES_${PN} += "${datadir}/gtkhtml-3.6"
do_stage() {
diff --git a/packages/libtool/libtool-1.5.10/rpath-control.patch b/packages/libtool/libtool-1.5.10/rpath-control.patch
new file mode 100644
index 0000000000..310fe3f8ae
--- /dev/null
+++ b/packages/libtool/libtool-1.5.10/rpath-control.patch
@@ -0,0 +1,21 @@
+diff --git a/ltmain.in b/ltmain.in
+--- a/ltmain.in
++++ b/ltmain.in
+@@ -3688,6 +3705,7 @@ EOF
+ rpath="$finalize_rpath"
+ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
++ if test "$OE_LT_RPATH_ALLOW" = "any" -o "${OE_LT_RPATH_ALLOW/:${libdir}:/}" != "$OE_LT_RPATH_ALLOW" ; then
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+@@ -3712,6 +3730,9 @@ EOF
+ *) perm_rpath="$perm_rpath $libdir" ;;
+ esac
+ fi
++ else
++ echo "OE: Not hardcoding '$libdir' into rpath"
++ fi
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb
index f4ca30ca6d..fbb37d88d7 100644
--- a/packages/libtool/libtool-cross_1.5.10.bb
+++ b/packages/libtool/libtool-cross_1.5.10.bb
@@ -1,15 +1,14 @@
SECTION = "devel"
require libtool_${PV}.bb
-PR = "r5"
+PR = "r6"
PACKAGES = ""
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
SRC_URI_append = " file://libdir-la.patch;patch=1 \
file://prefix.patch;patch=1 \
file://tag.patch;patch=1 \
file://tag1.patch;patch=1 \
- file://install-path-check.patch;patch=1 \
- file://never-ever-do-rpath.patch;patch=1 "
+ file://install-path-check.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
prefix = "${STAGING_DIR}"
diff --git a/packages/libtool/libtool-native_1.5.10.bb b/packages/libtool/libtool-native_1.5.10.bb
index 6d8b1a1d7c..2780ef64ff 100644
--- a/packages/libtool/libtool-native_1.5.10.bb
+++ b/packages/libtool/libtool-native_1.5.10.bb
@@ -1,13 +1,14 @@
SECTION = "devel"
require libtool_${PV}.bb
-PR = "r5"
+PR = "r6"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
SRC_URI_append = " file://libdir-la.patch;patch=1 \
file://prefix.patch;patch=1 \
file://tag.patch;patch=1 \
file://tag1.patch;patch=1 \
- file://install-path-check.patch;patch=1"
+ file://install-path-check.patch;patch=1 \
+ file://rpath-control.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
inherit native
diff --git a/packages/perl/perl-5.8.8/asm-pageh-fix.patch b/packages/perl/perl-5.8.8/asm-pageh-fix.patch
new file mode 100644
index 0000000000..41f3b1d23c
--- /dev/null
+++ b/packages/perl/perl-5.8.8/asm-pageh-fix.patch
@@ -0,0 +1,19 @@
+Perl inclues asm/page.h in order to get the definition for getpagesize which
+has been definied in unistd.h since glibc 2.1. Some recent version of linux
+libc headers removed the asm/page.h resulting in failures here for some
+people.
+
+Index: perl-5.8.8/ext/IPC/SysV/SysV.xs
+===================================================================
+--- perl-5.8.8.orig/ext/IPC/SysV/SysV.xs 2001-07-01 04:46:07.000000000 +1000
++++ perl-5.8.8/ext/IPC/SysV/SysV.xs 2007-07-06 11:40:21.000000000 +1000
+@@ -3,9 +3,6 @@
+ #include "XSUB.h"
+
+ #include <sys/types.h>
+-#ifdef __linux__
+-# include <asm/page.h>
+-#endif
+ #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
+ #ifndef HAS_SEM
+ # include <sys/ipc.h>
diff --git a/packages/perl/perl-5.8.8/native-makedepend-dash.patch b/packages/perl/perl-5.8.8/makedepend-dash.patch
index 1f15474377..1f15474377 100644
--- a/packages/perl/perl-5.8.8/native-makedepend-dash.patch
+++ b/packages/perl/perl-5.8.8/makedepend-dash.patch
diff --git a/packages/perl/perl-native_5.8.8.bb b/packages/perl/perl-native_5.8.8.bb
index ea839e00e8..0e89f11050 100644
--- a/packages/perl/perl-native_5.8.8.bb
+++ b/packages/perl/perl-native_5.8.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/"
SECTION = "libs"
LICENSE = "Artistic|GPL"
DEPENDS = "virtual/db-native gdbm-native"
-PR = "r12"
+PR = "r13"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
@@ -14,10 +14,8 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
file://native-nopacklist.patch;patch=1 \
file://native-no-gdbminc.patch;patch=1 \
file://native-perlinc.patch;patch=1 \
- file://native-makedepend-dash.patch;patch=1"
-
-# This sloppy patch breaks normal gcc
-# file://native-ssp.patch;patch=1
+ file://makedepend-dash.patch;patch=1 \
+ file://asm-pageh-fix.patch;patch=1"
S = "${WORKDIR}/perl-${PV}"
diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb
index 93b7c8ddd8..a3873d99fb 100644
--- a/packages/perl/perl_5.8.8.bb
+++ b/packages/perl/perl_5.8.8.bb
@@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL"
PRIORITY = "optional"
# We need gnugrep (for -I)
DEPENDS = "virtual/db perl-native grep-native"
-PR = "r22"
+PR = "r25"
# Major part of version
PVM = "5.8"
@@ -13,6 +13,7 @@ PVM = "5.8"
SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
file://Makefile.patch;patch=1 \
file://Makefile.SH.patch;patch=1 \
+ file://makedepend-dash.patch;patch=1 \
file://installperl.patch;patch=1 \
file://perl-dynloader.patch;patch=1 \
file://perl-moreconfig.patch;patch=1 \
@@ -27,6 +28,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
file://60_debian_libnet_config_path.patch;patch=1 \
file://62_debian_cpan_definstalldirs.patch;patch=1 \
file://64_debian_enc2xs_inc.patch;patch=1 \
+ file://asm-pageh-fix.patch;patch=1 \
file://config.sh \
file://config.sh-32 \
file://config.sh-32-le \
@@ -120,8 +122,18 @@ do_install() {
sed -i -e "s,${D},,g" \
-e "s,-isystem${STAGING_INCDIR} ,,g" \
-e "s,${STAGING_LIBDIR},${libdir},g" \
+ -e "s,${STAGING_BINDIR},${bindir},g" \
-e "s,${STAGING_INCDIR},${includedir},g" \
- ${D}/${libdir}/perl/${PV}/Config_heavy.pl
+ -e "s,${CROSS_DIR}${base_bindir}/,,g" \
+ ${D}${bindir}/h2xs \
+ ${D}${bindir}/h2ph \
+ ${D}${datadir}/perl/${PV}/pod/*.pod \
+ ${D}${datadir}/perl/${PV}/cacheout.pl \
+ ${D}${datadir}/perl/${PV}/FileCache.pm \
+ ${D}${libdir}/perl/${PV}/Config.pm \
+ ${D}${libdir}/perl/${PV}/Config_heavy.pl \
+ ${D}${libdir}/perl/${PV}/CORE/perl.h \
+ ${D}${libdir}/perl/${PV}/CORE/pp.h
fi
}
do_stage() {
diff --git a/packages/qemu/qemu-native.inc b/packages/qemu/qemu-native.inc
index c241de8706..81f09446dd 100644
--- a/packages/qemu/qemu-native.inc
+++ b/packages/qemu/qemu-native.inc
@@ -18,6 +18,8 @@ python __anonymous() {
data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3", d)
elif len(which(path, 'gcc-3.3.6')) != 0:
data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3.6", d)
+ elif len(which(path, 'gcc-3.4.6')) != 0:
+ data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.6", d)
}
do_stage() {
diff --git a/packages/qt/qt4_arch.inc b/packages/qt/qt4_arch.inc
index 11bfed8a1c..6dcbd2bc4a 100644
--- a/packages/qt/qt4_arch.inc
+++ b/packages/qt/qt4_arch.inc
@@ -2,7 +2,7 @@ def qt_arch(d):
import bb, re
arch = bb.data.getVar('TARGET_ARCH', d, 1)
if re.match("^i.86$", arch):
- arch = "x86"
+ arch = "i386"
elif re.match("^arm.*", arch):
arch = "arm"
elif arch == "x86_64":
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 04:32:00 +0000