* [PATCH 1/8] gmp: upgrade from 5.0.3 to 5.0.4
2012-03-15 2:02 [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits nitin.a.kamble
@ 2012-03-15 2:02 ` nitin.a.kamble
2012-03-15 2:02 ` [PATCH 2/8] automake: upgrade from 1.11.2 to 1.11.3 nitin.a.kamble
` (7 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: nitin.a.kamble @ 2012-03-15 2:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
gmp_bugfix.patch : removed this patch as it is in upstream now
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-support/gmp/gmp/gmp_bugfix.patch | 94 --------------------
.../gmp/{gmp_5.0.3.bb => gmp_5.0.4.bb} | 7 +-
2 files changed, 3 insertions(+), 98 deletions(-)
delete mode 100644 meta/recipes-support/gmp/gmp/gmp_bugfix.patch
rename meta/recipes-support/gmp/{gmp_5.0.3.bb => gmp_5.0.4.bb} (54%)
diff --git a/meta/recipes-support/gmp/gmp/gmp_bugfix.patch b/meta/recipes-support/gmp/gmp/gmp_bugfix.patch
deleted file mode 100644
index 329c880..0000000
--- a/meta/recipes-support/gmp/gmp/gmp_bugfix.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Upstream-Status: Pending
-
-When LONG_MIN is passed to val, -val is undefined. This patch fixes
-it. See for details: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50066
-
-Received this patch from H.J. Lu <hjl.tools@gmail.com>
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
-
---- gmp-4.3.2/mpf/iset_si.c.ll 2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpf/iset_si.c 2011-11-30 16:42:35.827944358 -0800
-@@ -31,7 +31,7 @@ mpf_init_set_si (mpf_ptr r, long int val
- r->_mp_prec = prec;
- r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB);
-
-- vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+ vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
-
- r->_mp_d[0] = vl & GMP_NUMB_MASK;
- size = vl != 0;
---- gmp-4.3.2/mpf/set_si.c.ll 2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpf/set_si.c 2011-11-30 16:42:47.823878367 -0800
-@@ -27,7 +27,7 @@ mpf_set_si (mpf_ptr dest, long val)
- mp_size_t size;
- mp_limb_t vl;
-
-- vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+ vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
-
- dest->_mp_d[0] = vl & GMP_NUMB_MASK;
- size = vl != 0;
---- gmp-4.3.2/mpz/cmp_si.c.ll 2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpz/cmp_si.c 2011-11-30 13:44:25.923319700 -0800
-@@ -27,7 +27,7 @@ _mpz_cmp_si (mpz_srcptr u, signed long i
- {
- mp_size_t usize = u->_mp_size;
- mp_size_t vsize;
-- mp_limb_t u_digit;
-+ mp_limb_t u_digit, vl_digit;
-
- #if GMP_NAIL_BITS != 0
- /* FIXME. This isn't very pretty. */
-@@ -41,11 +41,14 @@ _mpz_cmp_si (mpz_srcptr u, signed long i
-
- vsize = 0;
- if (v_digit > 0)
-- vsize = 1;
-+ {
-+ vsize = 1;
-+ vl_digit = (mp_limb_t) (unsigned long) v_digit;
-+ }
- else if (v_digit < 0)
- {
- vsize = -1;
-- v_digit = -v_digit;
-+ vl_digit = (mp_limb_t) -(unsigned long) v_digit;
- }
-
- if (usize != vsize)
-@@ -56,10 +59,10 @@ _mpz_cmp_si (mpz_srcptr u, signed long i
-
- u_digit = u->_mp_d[0];
-
-- if (u_digit == (mp_limb_t) (unsigned long) v_digit)
-+ if (u_digit == vl_digit)
- return 0;
-
-- if (u_digit > (mp_limb_t) (unsigned long) v_digit)
-+ if (u_digit > vl_digit)
- return usize;
- else
- return -usize;
---- gmp-4.3.2/mpz/iset_si.c.ll 2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpz/iset_si.c 2011-11-30 13:44:25.924319695 -0800
-@@ -31,7 +31,7 @@ mpz_init_set_si (mpz_ptr dest, signed lo
- dest->_mp_alloc = 1;
- dest->_mp_d = (mp_ptr) (*__gmp_allocate_func) (BYTES_PER_MP_LIMB);
-
-- vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+ vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
-
- dest->_mp_d[0] = vl & GMP_NUMB_MASK;
- size = vl != 0;
---- gmp-4.3.2/mpz/set_si.c.ll 2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpz/set_si.c 2011-11-30 13:44:25.947319574 -0800
-@@ -27,7 +27,7 @@ mpz_set_si (mpz_ptr dest, signed long in
- mp_size_t size;
- mp_limb_t vl;
-
-- vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+ vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
-
- dest->_mp_d[0] = vl & GMP_NUMB_MASK;
- size = vl != 0;
diff --git a/meta/recipes-support/gmp/gmp_5.0.3.bb b/meta/recipes-support/gmp/gmp_5.0.4.bb
similarity index 54%
rename from meta/recipes-support/gmp/gmp_5.0.3.bb
rename to meta/recipes-support/gmp/gmp_5.0.4.bb
index 9f37943..9adcc3f 100644
--- a/meta/recipes-support/gmp/gmp_5.0.3.bb
+++ b/meta/recipes-support/gmp/gmp_5.0.4.bb
@@ -4,11 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
PR = "r0"
-SRC_URI_append += "file://gmp_bugfix.patch \
- file://use-includedir.patch \
+SRC_URI_append += "file://use-includedir.patch \
file://gmp_fix_for_x32.patch"
export CC_FOR_BUILD = "${BUILD_CC}"
-SRC_URI[md5sum] = "8061f765cc86b9765921a0c800615804"
-SRC_URI[sha256sum] = "dcafe9989c7f332b373e1f766af8e9cd790fc802fdec422a1910a6ef783480e3"
+SRC_URI[md5sum] = "50c3edcb7c9438e04377ee9a1a061b79"
+SRC_URI[sha256sum] = "35d4aade3e4bdf0915c944599b10d23f108ffedf6c3188aeec52221c5cf9a06f"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 2/8] automake: upgrade from 1.11.2 to 1.11.3
2012-03-15 2:02 [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits nitin.a.kamble
2012-03-15 2:02 ` [PATCH 1/8] gmp: upgrade from 5.0.3 to 5.0.4 nitin.a.kamble
@ 2012-03-15 2:02 ` nitin.a.kamble
2012-03-15 2:02 ` [PATCH 3/8] distro-tracking: update status of recipes nitin.a.kamble
` (6 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: nitin.a.kamble @ 2012-03-15 2:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Removed already upstream patch:
automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
Rebased these patches to the newer code:
automake/prefer-cpio-over-pax-for-ustar-archives.patch
automake/python-libdir.patch
Changed the tarball name from bz2 to gz, as the bz2 tar ball
is not published for the 1.11.3 version.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-devtools/automake/automake.inc | 2 +-
...utomake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch | 118 --------------------
.../prefer-cpio-over-pax-for-ustar-archives.patch | 30 +++--
.../automake/automake/python-libdir.patch | 32 +++---
.../{automake_1.11.2.bb => automake_1.11.3.bb} | 8 +-
5 files changed, 36 insertions(+), 154 deletions(-)
delete mode 100644 meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
rename meta/recipes-devtools/automake/{automake_1.11.2.bb => automake_1.11.3.bb} (85%)
diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc
index 7eef9ec..370caca 100644
--- a/meta/recipes-devtools/automake/automake.inc
+++ b/meta/recipes-devtools/automake/automake.inc
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
HOMEPAGE = "http://www.gnu.org/software/automake/"
SECTION = "devel"
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.gz"
inherit autotools
diff --git a/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch b/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
deleted file mode 100644
index f06dfe3..0000000
--- a/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Upstream-Status: Backport
-
-Backporting this patch from automake devel git tree.
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2012/01/05
-
-
-From 4e4dae500390d2ace681e4e4bc4c590ecdca38c6 Mon Sep 17 00:00:00 2001
-From: Stefano Lattarini <stefano.lattarini@gmail.com>
-Date: Tue, 03 Jan 2012 08:06:09 +0000
-Subject: install: pkglibexec_SCRIPTS is a valid prefix/primary combination
-
-It makes little sense for `libexec_SCRIPTS' to be accepted as valid
-while `pkglibexec_SCRIPTS' is not. So fix this inconsistency by
-explicitly allowing `pkglibexec_SCRIPTS' as well. It is worth
-noting that the inconsistency has been there for a long time,
-but only the quite recent commit `v1.11-373-g9ca6326' "Warnings
-about primary/prefix mismatch fixed and extended" has made it
-noisy enough to be noticed.
-
-* automake.in (handle_scripts): Also list `pkglibexec' among the
-prefixes valid for the `SCRIPTS' primary.
-* doc/automake.texi (Scripts): Likewise.
-* tests/primary-prefix-valid-couples.test: Update.
-* THANKS: Likewise.
-* NEWS: Likewise.
-
-Reported by Dennis Schridde on the automake list:
-<http://lists.gnu.org/archive/html/automake/2012-01/msg00002.html>
----
-diff --git a/NEWS b/NEWS
-index 599f19f..2e572e4 100644
---- a/NEWS
-+++ b/NEWS
-@@ -82,6 +82,11 @@ New in 1.11.0a:
-
- Bugs fixed in 1.11.0a:
-
-+* Bugs introduced by 1.11.2:
-+
-+ - Automake now correctly recognizes the prefix/primary combination
-+ `pkglibexec_SCRIPTS' as valid.
-+
- * Bugs introduced by 1.11:
-
- - The `parallel-tests' test driver works around a GNU make 3.80 bug with
-diff --git a/THANKS b/THANKS
-index e9da06c..e9c6db8 100644
---- a/THANKS
-+++ b/THANKS
-@@ -78,6 +78,7 @@ David Pashley david@davidpashley.com
- David Zaroski cz253@cleveland.Freenet.Edu
- Dean Povey dpovey@wedgetail.com
- Dennis J. Linse Dennis.J.Linse@SAIC.com
-+Dennis Schridde devurandom@gmx.net
- Derek R. Price derek.price@openavenue.com
- Diab Jerius djerius@cfa.harvard.edu
- Didier Cassirame faded@free.fr
-diff --git a/automake.in b/automake.in
-index a852195..a689b63 100644
---- a/automake.in
-+++ b/automake.in
-@@ -3091,7 +3091,7 @@ sub handle_scripts
- # useful to sometimes distribute scripts verbatim. This happens
- # e.g. in Automake itself.
- &am_install_var ('-candist', 'scripts', 'SCRIPTS',
-- 'bin', 'sbin', 'libexec', 'pkgdata',
-+ 'bin', 'sbin', 'libexec', 'pkglibexec', 'pkgdata',
- 'noinst', 'check');
- }
-
-diff --git a/doc/automake.texi b/doc/automake.texi
-index cebe084..0c4dc01 100644
---- a/doc/automake.texi
-+++ b/doc/automake.texi
-@@ -7099,11 +7099,12 @@ prefix as with other primaries.
- @vindex sbin_SCRIPTS
- @vindex libexec_SCRIPTS
- @vindex pkgdata_SCRIPTS
-+@vindex pkglibexec_SCRIPTS
- @vindex noinst_SCRIPTS
- @vindex check_SCRIPTS
-
- Scripts can be installed in @code{bindir}, @code{sbindir},
--@code{libexecdir}, or @code{pkgdatadir}.
-+@code{libexecdir}, @code{pkglibexecdir}, or @code{pkgdatadir}.
-
- Scripts that need not be installed can be listed in
- @code{noinst_SCRIPTS}, and among them, those which are needed only by
-diff --git a/tests/primary-prefix-invalid-couples.test b/tests/primary-prefix-invalid-couples.test
-index 88e0817..c3d6471 100755
---- a/tests/primary-prefix-invalid-couples.test
-+++ b/tests/primary-prefix-invalid-couples.test
-@@ -79,7 +79,7 @@ for primary in $primaries; do
- prefixes_ok='bin sbin libexec pkglibexec'
- ;;
- SCRIPTS)
-- prefixes_ok='bin sbin libexec pkgdata'
-+ prefixes_ok='bin sbin libexec pkglibexec pkgdata'
- ;;
- DATA)
- prefixes_ok='data dataroot pkgdata doc html dvi pdf ps
-diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix-valid-couples.test
-index 36ff5d8..6eb4149 100755
---- a/tests/primary-prefix-valid-couples.test
-+++ b/tests/primary-prefix-valid-couples.test
-@@ -57,7 +57,7 @@ for p in lib pkglib; do
- echo "${p}_LTLIBRARIES = libd-$p.la" >> Makefile.am
- done
-
--for p in bin sbin libexec pkgdata; do
-+for p in bin sbin libexec pkglibexec pkgdata; do
- echo "${p}_SCRIPTS = $p.sh" >> Makefile.am
- done
-
---
-cgit v0.9.0.2
diff --git a/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch b/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
index 7bc8caf..4627855 100644
--- a/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
+++ b/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
@@ -15,11 +15,15 @@ Upstream-Status: Pending
Signed-off-by: Tom Rini <tom_rini@mentor.com>
-Index: automake-1.11.1/m4/tar.m4
+Updated for version 1.11.3:
+Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: 2011/03/14
+
+Index: automake-1.11.3/m4/tar.m4
===================================================================
---- automake-1.11.1.orig/m4/tar.m4
-+++ automake-1.11.1/m4/tar.m4
-@@ -30,7 +30,7 @@ m4_if([$1], [v7],
+--- automake-1.11.3.orig/m4/tar.m4 2012-01-31 03:41:18.000000000 -0800
++++ automake-1.11.3/m4/tar.m4 2012-03-14 17:36:11.901303777 -0700
+@@ -31,7 +31,7 @@ m4_if([$1], [v7],
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
# Loop over all known methods to create a tar archive until one works.
@@ -28,16 +32,16 @@ Index: automake-1.11.1/m4/tar.m4
_am_tools=${am_cv_prog_tar_$1-$_am_tools}
# Do not fold the above two line into one, because Tru64 sh and
# Solaris sh will not grok spaces in the rhs of `-'.
-Index: automake-1.11.1/Makefile.in
+Index: automake-1.11.3/Makefile.in
===================================================================
---- automake-1.11.1.orig/Makefile.in
-+++ automake-1.11.1/Makefile.in
-@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
+--- automake-1.11.3.orig/Makefile.in 2012-02-01 02:37:59.000000000 -0800
++++ automake-1.11.3/Makefile.in 2012-03-14 17:38:03.530869197 -0700
+@@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
- $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
-- $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
-+ $(top_srcdir)/m4/substnot.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \
+ $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \
+- $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac
++ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch
index 63dafca..93a74c7 100644
--- a/meta/recipes-devtools/automake/automake/python-libdir.patch
+++ b/meta/recipes-devtools/automake/automake/python-libdir.patch
@@ -2,11 +2,11 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-Index: automake-1.11.1/m4/python.m4
+Index: automake-1.11.3/m4/python.m4
===================================================================
---- automake-1.11.1.orig/m4/python.m4
-+++ automake-1.11.1/m4/python.m4
-@@ -88,12 +88,13 @@ python2.1 python2.0])
+--- automake-1.11.3.orig/m4/python.m4 2012-01-31 03:41:18.000000000 -0800
++++ automake-1.11.3/m4/python.m4 2012-03-14 17:48:49.194509698 -0700
+@@ -92,12 +92,13 @@ AC_DEFUN([AM_PATH_PYTHON],
[am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
@@ -22,16 +22,14 @@ Index: automake-1.11.1/m4/python.m4
AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
dnl At times (like when building shared libraries) you may want
-@@ -122,7 +123,7 @@ python2.1 python2.0])
- am_py_prefix=$prefix
- fi
- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
-- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
+@@ -127,13 +128,13 @@ AC_DEFUN([AM_PATH_PYTHON],
case $am_cv_python_pythondir in
$am_py_prefix*)
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-@@ -132,7 +133,7 @@ python2.1 python2.0])
+- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
++ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix/lib,$PYTHON_LIB_PREFIX,"`
+ ;;
+ *)
case $am_py_prefix in
/usr|/System*) ;;
*)
@@ -40,16 +38,14 @@ Index: automake-1.11.1/m4/python.m4
;;
esac
;;
-@@ -160,7 +161,7 @@ python2.1 python2.0])
- am_py_exec_prefix=$exec_prefix
- fi
- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
-- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
+@@ -162,13 +163,13 @@ AC_DEFUN([AM_PATH_PYTHON],
case $am_cv_python_pyexecdir in
$am_py_exec_prefix*)
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
-@@ -170,7 +171,7 @@ python2.1 python2.0])
+- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix/lib,$PYTHON_LIB_PREFIX,"`
+ ;;
+ *)
case $am_py_exec_prefix in
/usr|/System*) ;;
*)
diff --git a/meta/recipes-devtools/automake/automake_1.11.2.bb b/meta/recipes-devtools/automake/automake_1.11.3.bb
similarity index 85%
rename from meta/recipes-devtools/automake/automake_1.11.2.bb
rename to meta/recipes-devtools/automake/automake_1.11.3.bb
index 4271336..8c56fc7 100644
--- a/meta/recipes-devtools/automake/automake_1.11.2.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.3.bb
@@ -37,12 +37,12 @@ PATHFIXPATCH_virtclass-nativesdk = ""
SRC_URI += "${PATHFIXPATCH} \
file://prefer-cpio-over-pax-for-ustar-archives.patch \
file://python-libdir.patch \
- file://automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch \
file://py-compile-compile-only-optimized-byte-code.patch"
-PR = "r2"
-SRC_URI[md5sum] = "18194e804d415767bae8f703c963d456"
-SRC_URI[sha256sum] = "4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718"
+SRC_URI[md5sum] = "93ecb319f0365cb801990b00f658d026"
+SRC_URI[sha256sum] = "921b5188057e57bdd9c0ba06e21d0b0ea7dafa61a9bd08a2b041215bcff12f55"
+
+PR = "r0"
do_install () {
oe_runmake 'DESTDIR=${D}' install
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 3/8] distro-tracking: update status of recipes
2012-03-15 2:02 [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits nitin.a.kamble
2012-03-15 2:02 ` [PATCH 1/8] gmp: upgrade from 5.0.3 to 5.0.4 nitin.a.kamble
2012-03-15 2:02 ` [PATCH 2/8] automake: upgrade from 1.11.2 to 1.11.3 nitin.a.kamble
@ 2012-03-15 2:02 ` nitin.a.kamble
2012-03-15 2:02 ` [PATCH 4/8] ncurses: fix install error nitin.a.kamble
` (5 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: nitin.a.kamble @ 2012-03-15 2:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 24 ++++++++++---------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 8ad924b..b4ea423 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -37,7 +37,8 @@ RECIPE_MANUAL_CHECK_DATE_pn-libpcre = "Feb 01, 2012"
RECIPE_MAINTAINER_pn-libpcre = "Nitin A Kamble <nitin.a.kamble@intel.com>"
DISTRO_PN_ALIAS_pn-libpcre = "Mandriva=libpcre0 Fedora=pcre"
-RECIPE_LATEST_VERSION_pn-bdwgc = "7.2alpha5"
+RECIPE_LATEST_VERSION_pn-bdwgc = "20110107"
+RECIPE_NO_UPDATE_REASON_pn-bdwgc = "20110107 is same as the 7.2alpha5"
RECIPE_LAST_UPDATE_pn-bdwgc = "Feb 01, 2012"
RECIPE_MANUAL_CHECK_DATE_pn-bdwgc = "Feb 01, 2012"
RECIPE_MAINTAINER_pn-bdwgc = "Nitin A Kamble <nitin.a.kamble@intel.com>"
@@ -3089,9 +3090,9 @@ RECIPE_NO_UPDATE_REASON_pn-autoconf="seeing rpm issue with the 2.68 version, a b
RECIPE_MAINTAINER_pn-autoconf = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-automake="green"
-RECIPE_LATEST_VERSION_pn-automake="1.11.1"
-RECIPE_LAST_UPDATE_pn-automake = "Jan 29, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-automake = "Jul 06, 2011"
+RECIPE_LATEST_VERSION_pn-automake="1.11.3"
+RECIPE_LAST_UPDATE_pn-automake = "Mar 14, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-automake = "Mar 14, 2012"
RECIPE_MAINTAINER_pn-automake = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-bison="green"
@@ -3278,9 +3279,9 @@ RECIPE_LAST_UPDATE_pn-mpfr = "Nov 15, 2011"
RECIPE_MAINTAINER_pn-mpfr = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-gmp="green"
-RECIPE_LATEST_VERSION_pn-gmp="5.0.3"
-RECIPE_LAST_UPDATE_pn-gmp = "Feb 01, 2012"
-RECIPE_MANUAL_CHECK_DATE_pn-gmp = "Feb 01, 2012"
+RECIPE_LATEST_VERSION_pn-gmp="5.0.4"
+RECIPE_LAST_UPDATE_pn-gmp = "Mar 14, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-gmp = "Mar 14, 2012"
RECIPE_MAINTAINER_pn-gmp = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-libmpc="green"
@@ -5933,10 +5934,11 @@ RECIPE_STATUS_pn-groff = "red"
RECIPE_LATEST_VERSION_pn-groff = "1.21"
RECIPE_NO_UPDATE_REASON_pn-groff = "1.18.1.4 is latest GPLv2 Version no 1.21"
-RECIPE_STATUS_pn-eglibc = "red"
-RECIPE_LATEST_VERSION_pn-eglibc = "2.13-r15508"
-RECIPE_LAST_UPDATE_pn-eglibc = "Nov 16, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-eglibc = "Nov 16, 2011"
+RECIPE_STATUS_pn-eglibc = "green"
+RECIPE_LATEST_VERSION_pn-eglibc = "git:16540"
+RECIPE_LAST_UPDATE_pn-eglibc = "Jan 01, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-eglibc = "Jan 01, 2012"
+RECIPE_MAINTAINER_pn-eglibc = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-lighttpd = "red"
RECIPE_LAST_UPDATE_pn-lighttpd = "Jul 28, 2011"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 4/8] ncurses: fix install error
2012-03-15 2:02 [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits nitin.a.kamble
` (2 preceding siblings ...)
2012-03-15 2:02 ` [PATCH 3/8] distro-tracking: update status of recipes nitin.a.kamble
@ 2012-03-15 2:02 ` nitin.a.kamble
2012-03-15 2:51 ` Scott Garman
2012-03-15 2:02 ` [PATCH 5/8] python: fix install when libdir is not "lib" nitin.a.kamble
` (4 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: nitin.a.kamble @ 2012-03-15 2:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Fix this issue:
| rm: cannot remove `/srv/home/nitin/builds/build-multilib/tmp/work/x86_64-poky-linux/ncurses-5.9-r6.1/image/usr/lib64/terminfo': No such file or directory
NOTE: package ncurses-5.9-r6.1: task do_install: Failed
PR not bumped as there is no change in the packages output.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-core/ncurses/ncurses.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 3319949..4d64f5e 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -151,7 +151,7 @@ shell_do_install() {
ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm
fi
- rm ${D}${libdir}/terminfo
+ rm -f ${D}${libdir}/terminfo
if [ "${PN}" = "ncurses" ]; then
mv ${D}${bindir}/clear ${D}${bindir}/clear.${PN}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 4/8] ncurses: fix install error
2012-03-15 2:02 ` [PATCH 4/8] ncurses: fix install error nitin.a.kamble
@ 2012-03-15 2:51 ` Scott Garman
0 siblings, 0 replies; 22+ messages in thread
From: Scott Garman @ 2012-03-15 2:51 UTC (permalink / raw)
To: openembedded-core
On 03/14/2012 07:02 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>
> Fix this issue:
> | rm: cannot remove `/srv/home/nitin/builds/build-multilib/tmp/work/x86_64-poky-linux/ncurses-5.9-r6.1/image/usr/lib64/terminfo': No such file or directory
> NOTE: package ncurses-5.9-r6.1: task do_install: Failed
>
> PR not bumped as there is no change in the packages output.
>
> Signed-off-by: Nitin A Kamble<nitin.a.kamble@intel.com>
Thank you for catching this.
Acked-by: Scott Garman <scott.a.garman@intel.com>
> ---
> meta/recipes-core/ncurses/ncurses.inc | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
> index 3319949..4d64f5e 100644
> --- a/meta/recipes-core/ncurses/ncurses.inc
> +++ b/meta/recipes-core/ncurses/ncurses.inc
> @@ -151,7 +151,7 @@ shell_do_install() {
> ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm
> fi
>
> - rm ${D}${libdir}/terminfo
> + rm -f ${D}${libdir}/terminfo
>
> if [ "${PN}" = "ncurses" ]; then
> mv ${D}${bindir}/clear ${D}${bindir}/clear.${PN}
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 5/8] python: fix install when libdir is not "lib"
2012-03-15 2:02 [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits nitin.a.kamble
` (3 preceding siblings ...)
2012-03-15 2:02 ` [PATCH 4/8] ncurses: fix install error nitin.a.kamble
@ 2012-03-15 2:02 ` nitin.a.kamble
2012-03-15 2:59 ` Andreas Oberritter
2012-03-15 7:19 ` Martin Jansa
2012-03-15 2:02 ` [PATCH 6/8] multilib.conf: add other abi packages to target gcc's dependencies nitin.a.kamble
` (3 subsequent siblings)
8 siblings, 2 replies; 22+ messages in thread
From: nitin.a.kamble @ 2012-03-15 2:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
This commit fixes python's install issue of not finding the
native pythong binray modules.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../python/fix_for_using_different_libdir.patch | 78 ++++++++++++++++++++
meta/recipes-devtools/python/python_2.7.2.bb | 3 +-
2 files changed, 80 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
diff --git a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
new file mode 100644
index 0000000..e8f19a2
--- /dev/null
+++ b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
@@ -0,0 +1,78 @@
+Upstream-Status: Inappropriate [Embedded specific]
+
+This patch fixes issuing with different libdir like lib64.
+This patch makes the native python binary modules findable
+in the install process of the host python.
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: 2012/03/14
+
+Index: Python-2.7.2/Lib/sysconfig.py
+===================================================================
+--- Python-2.7.2.orig/Lib/sysconfig.py
++++ Python-2.7.2/Lib/sysconfig.py
+@@ -7,10 +7,10 @@ from os.path import pardir, realpath
+
+ _INSTALL_SCHEMES = {
+ 'posix_prefix': {
+- 'stdlib': '{base}/lib/python{py_version_short}',
+- 'platstdlib': '{platbase}/lib/python{py_version_short}',
+- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
+- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
++ 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}',
++ 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}',
++ 'purelib': '{base}/'+sys.lib+'/python{py_version_short}/site-packages',
++ 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages',
+ 'include': '{base}/include/python{py_version_short}',
+ 'platinclude': '{platbase}/include/python{py_version_short}',
+ 'scripts': '{base}/bin',
+@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = {
+ 'data' : '{userbase}',
+ },
+ 'posix_user': {
+- 'stdlib': '{userbase}/lib/python{py_version_short}',
+- 'platstdlib': '{userbase}/lib/python{py_version_short}',
+- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
+- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
++ 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
++ 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
++ 'purelib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
++ 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
+ 'include': '{userbase}/include/python{py_version_short}',
+ 'scripts': '{userbase}/bin',
+ 'data' : '{userbase}',
+Index: Python-2.7.2/Makefile.pre.in
+===================================================================
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -928,25 +928,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL
+ done; \
+ done
+ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
++ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST) -f \
+ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ $(DESTDIR)$(LIBDEST)
+- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
++ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST) -f \
+ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ $(DESTDIR)$(LIBDEST)
+- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
++ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
++ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
++ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
+ $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
+
+ # Create the PLATDIR source directory, if one wasn't distributed..
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index d2100be..412b294 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -20,7 +20,7 @@ SRC_URI += "\
file://setup_py_skip_cross_import_check.patch \
file://add-md5module-support.patch \
file://host_include_contamination.patch \
- file://sys_platform_is_now_always_linux2.patch \
+ file://fix_for_using_different_libdir.patch \
"
S = "${WORKDIR}/Python-${PV}"
@@ -99,6 +99,7 @@ do_install() {
oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+ CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
STAGING_LIBDIR=${STAGING_LIBDIR} \
STAGING_INCDIR=${STAGING_INCDIR} \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 5/8] python: fix install when libdir is not "lib"
2012-03-15 2:02 ` [PATCH 5/8] python: fix install when libdir is not "lib" nitin.a.kamble
@ 2012-03-15 2:59 ` Andreas Oberritter
2012-03-15 15:53 ` Kamble, Nitin A
2012-03-15 7:19 ` Martin Jansa
1 sibling, 1 reply; 22+ messages in thread
From: Andreas Oberritter @ 2012-03-15 2:59 UTC (permalink / raw)
To: openembedded-core
Hello Nitin,
On 15.03.2012 03:02, nitin.a.kamble@intel.com wrote:
> --- a/meta/recipes-devtools/python/python_2.7.2.bb
> +++ b/meta/recipes-devtools/python/python_2.7.2.bb
> @@ -20,7 +20,7 @@ SRC_URI += "\
> file://setup_py_skip_cross_import_check.patch \
> file://add-md5module-support.patch \
> file://host_include_contamination.patch \
> - file://sys_platform_is_now_always_linux2.patch \
did you remove this one by accident?
Regards,
Andreas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 5/8] python: fix install when libdir is not "lib"
2012-03-15 2:59 ` Andreas Oberritter
@ 2012-03-15 15:53 ` Kamble, Nitin A
0 siblings, 0 replies; 22+ messages in thread
From: Kamble, Nitin A @ 2012-03-15 15:53 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Andreas Oberritter
> Sent: Wednesday, March 14, 2012 8:00 PM
> To: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 5/8] python: fix install when libdir is
> not "lib"
>
> Hello Nitin,
>
> On 15.03.2012 03:02, nitin.a.kamble@intel.com wrote:
> > --- a/meta/recipes-devtools/python/python_2.7.2.bb
> > +++ b/meta/recipes-devtools/python/python_2.7.2.bb
> > @@ -20,7 +20,7 @@ SRC_URI += "\
> > file://setup_py_skip_cross_import_check.patch \
> > file://add-md5module-support.patch \
> > file://host_include_contamination.patch \
> > - file://sys_platform_is_now_always_linux2.patch \
>
> did you remove this one by accident?
>
> Regards,
> Andreas
>
Andreas,
Yes, it was an accident. I will correct it. Thanks for catching.
Nitin
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 5/8] python: fix install when libdir is not "lib"
2012-03-15 2:02 ` [PATCH 5/8] python: fix install when libdir is not "lib" nitin.a.kamble
2012-03-15 2:59 ` Andreas Oberritter
@ 2012-03-15 7:19 ` Martin Jansa
2012-03-15 16:06 ` Kamble, Nitin A
1 sibling, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2012-03-15 7:19 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1628 bytes --]
On Wed, Mar 14, 2012 at 07:02:14PM -0700, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> This commit fixes python's install issue of not finding the
> native pythong binray modules.
>
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
> .../python/fix_for_using_different_libdir.patch | 78 ++++++++++++++++++++
> meta/recipes-devtools/python/python_2.7.2.bb | 3 +-
> 2 files changed, 80 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
>
> diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
> index d2100be..412b294 100644
> --- a/meta/recipes-devtools/python/python_2.7.2.bb
> +++ b/meta/recipes-devtools/python/python_2.7.2.bb
> @@ -20,7 +20,7 @@ SRC_URI += "\
> file://setup_py_skip_cross_import_check.patch \
> file://add-md5module-support.patch \
> file://host_include_contamination.patch \
> - file://sys_platform_is_now_always_linux2.patch \
> + file://fix_for_using_different_libdir.patch \
^ really?
> "
>
> S = "${WORKDIR}/Python-${PV}"
> @@ -99,6 +99,7 @@ do_install() {
>
> oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
> HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
> + CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
> STAGING_LIBDIR=${STAGING_LIBDIR} \
> STAGING_INCDIR=${STAGING_INCDIR} \
> BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 5/8] python: fix install when libdir is not "lib"
2012-03-15 7:19 ` Martin Jansa
@ 2012-03-15 16:06 ` Kamble, Nitin A
0 siblings, 0 replies; 22+ messages in thread
From: Kamble, Nitin A @ 2012-03-15 16:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Martin Jansa
> Sent: Thursday, March 15, 2012 12:19 AM
> To: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH 5/8] python: fix install when libdir is
> not "lib"
>
> On Wed, Mar 14, 2012 at 07:02:14PM -0700, nitin.a.kamble@intel.com
> wrote:
> > From: Nitin A Kamble <nitin.a.kamble@intel.com>
> >
> > This commit fixes python's install issue of not finding the native
> > pythong binray modules.
> >
> > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> > ---
> > .../python/fix_for_using_different_libdir.patch | 78
> ++++++++++++++++++++
> > meta/recipes-devtools/python/python_2.7.2.bb | 3 +-
> > 2 files changed, 80 insertions(+), 1 deletions(-) create mode
> 100644
> > meta/recipes-
> devtools/python/python/fix_for_using_different_libdir.pat
> > ch
> >
> > diff --git a/meta/recipes-devtools/python/python_2.7.2.bb
> > b/meta/recipes-devtools/python/python_2.7.2.bb
> > index d2100be..412b294 100644
> > --- a/meta/recipes-devtools/python/python_2.7.2.bb
> > +++ b/meta/recipes-devtools/python/python_2.7.2.bb
> > @@ -20,7 +20,7 @@ SRC_URI += "\
> > file://setup_py_skip_cross_import_check.patch \
> > file://add-md5module-support.patch \
> > file://host_include_contamination.patch \
> > - file://sys_platform_is_now_always_linux2.patch \
> > + file://fix_for_using_different_libdir.patch \
>
> ^ really?
Martin,
Removing a patch was an accident. It is getting fixed now. Thanks for catching it.
Nitin
>
> > "
> >
> > S = "${WORKDIR}/Python-${PV}"
> > @@ -99,6 +99,7 @@ do_install() {
> >
> > oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
> > HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
> > +
> > +CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-
> d
> > +ynload/ \
> > STAGING_LIBDIR=${STAGING_LIBDIR} \
> > STAGING_INCDIR=${STAGING_INCDIR} \
> > BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 6/8] multilib.conf: add other abi packages to target gcc's dependencies
2012-03-15 2:02 [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits nitin.a.kamble
` (4 preceding siblings ...)
2012-03-15 2:02 ` [PATCH 5/8] python: fix install when libdir is not "lib" nitin.a.kamble
@ 2012-03-15 2:02 ` nitin.a.kamble
2012-03-15 2:02 ` [PATCH 7/8] gcc: remove the 64bithack patch nitin.a.kamble
` (2 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: nitin.a.kamble @ 2012-03-15 2:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/conf/multilib.conf | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 3b47c48..e71918a 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -6,6 +6,9 @@ MULTILIB_SAVE_VARNAME = "DEFAULTTUNE"
MULTILIBS ??= "multilib:lib32"
+# This adds multilib gcc components like "lib32-libgcc libx32-libgcc"
+DEPENDS_append_pn-gcc = "${@'-libgcc '.join(d.getVar('MULTILIB_VARIANTS',True) .split() + [''])}"
+
STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 7/8] gcc: remove the 64bithack patch
2012-03-15 2:02 [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits nitin.a.kamble
` (5 preceding siblings ...)
2012-03-15 2:02 ` [PATCH 6/8] multilib.conf: add other abi packages to target gcc's dependencies nitin.a.kamble
@ 2012-03-15 2:02 ` nitin.a.kamble
2012-03-15 8:30 ` Richard Purdie
2012-03-15 2:02 ` [PATCH 8/8] gcc: enable multilib for target gcc nitin.a.kamble
2012-03-21 18:59 ` [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits Saul Wold
8 siblings, 1 reply; 22+ messages in thread
From: nitin.a.kamble @ 2012-03-15 2:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
and bump PR
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 1 -
meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch | 68 ---------------------
2 files changed, 0 insertions(+), 69 deletions(-)
delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 99c30a6..08f2a54 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -59,7 +59,6 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://gcc-poison-system-directories.patch \
file://gcc-poison-dir-extend.patch \
file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
- file://64bithack.patch \
file://optional_libstdc.patch \
file://disable_relax_pic_calls_flag.patch \
file://COLLECT_GCC_OPTIONS.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
deleted file mode 100644
index d35753a..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-GCC has internal multilib handling code but it assumes a very specific rigid directory
-layout. The build system implementation of multilib layout is very generic and allows
-complete customisation of the library directories.
-
-This patch is a partial solution to allow any custom directories to be passed into gcc
-and handled correctly. It forces gcc to use the base_libdir (which is the current
-directory, "."). We need to do this for each multilib that is configured as we don't
-know which compiler options may be being passed into the compiler. Since we have a compiler
-per mulitlib at this point that isn't an issue.
-
-The one problem is the target compiler is only going to work for the default multlilib at
-this point. Ideally we'd figure out which multilibs were being enabled with which paths
-and be able to patch these entries with a complete set of correct paths but this we
-don't have such code at this point. This is something the target gcc recipe should do
-and override these platform defaults in its build config.
-
-RP 15/8/11
-
-Index: gcc-4_6-branch/gcc/config/i386/t-linux64
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/i386/t-linux64 2011-06-23 15:15:29.000000000 +0100
-+++ gcc-4_6-branch/gcc/config/i386/t-linux64 2011-08-15 13:09:03.772415848 +0100
-@@ -24,8 +24,8 @@
- # MULTILIB_OSDIRNAMES according to what is found on the target.
-
- MULTILIB_OPTIONS = m64/m32
--MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_DIRNAMES = . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
-
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-Index: gcc-4_6-branch/gcc/config/mips/t-linux64
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/mips/t-linux64 2011-08-15 13:06:13.732415763 +0100
-+++ gcc-4_6-branch/gcc/config/mips/t-linux64 2011-08-15 13:09:11.452419446 +0100
-@@ -17,8 +17,8 @@
- # <http://www.gnu.org/licenses/>.
-
- MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
--MULTILIB_DIRNAMES = n32 32 64
--MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
-+MULTILIB_DIRNAMES = . . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
-
- EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
-
-Index: gcc-4_6-branch/gcc/config/rs6000/t-linux64
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/rs6000/t-linux64 2011-08-15 13:06:25.272415822 +0100
-+++ gcc-4_6-branch/gcc/config/rs6000/t-linux64 2011-08-15 13:09:21.062415878 +0100
-@@ -32,11 +32,11 @@
- # MULTILIB_OSDIRNAMES according to what is found on the target.
-
- MULTILIB_OPTIONS = m64/m32 msoft-float
--MULTILIB_DIRNAMES = 64 32 nof
-+MULTILIB_DIRNAMES = . . .
- MULTILIB_EXTRA_OPTS = fPIC mstrict-align
- MULTILIB_EXCEPTIONS = m64/msoft-float
- MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
- MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
-
- softfp_wrap_start := '\#ifndef __powerpc64__'
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 7/8] gcc: remove the 64bithack patch
2012-03-15 2:02 ` [PATCH 7/8] gcc: remove the 64bithack patch nitin.a.kamble
@ 2012-03-15 8:30 ` Richard Purdie
2012-03-15 16:03 ` Kamble, Nitin A
0 siblings, 1 reply; 22+ messages in thread
From: Richard Purdie @ 2012-03-15 8:30 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2012-03-14 at 19:02 -0700, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> and bump PR
>
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
> meta/recipes-devtools/gcc/gcc-4.6.inc | 1 -
> meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch | 68 ---------------------
> 2 files changed, 0 insertions(+), 69 deletions(-)
> delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
As far as I can tell whilst this will make multilib work on the target
device, since you've removed this patch, the actual -cross toolchains
used for multilib builds will be broken since they may or may not look
in the correct libdir?
Cheers,
Richard
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 7/8] gcc: remove the 64bithack patch
2012-03-15 8:30 ` Richard Purdie
@ 2012-03-15 16:03 ` Kamble, Nitin A
0 siblings, 0 replies; 22+ messages in thread
From: Kamble, Nitin A @ 2012-03-15 16:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Richard Purdie
> Sent: Thursday, March 15, 2012 1:31 AM
> To: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH 7/8] gcc: remove the 64bithack patch
>
> On Wed, 2012-03-14 at 19:02 -0700, nitin.a.kamble@intel.com wrote:
> > From: Nitin A Kamble <nitin.a.kamble@intel.com>
> >
> > and bump PR
> >
> > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> > ---
> > meta/recipes-devtools/gcc/gcc-4.6.inc | 1 -
> > meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch | 68 -----------
> ----------
> > 2 files changed, 0 insertions(+), 69 deletions(-)
> > delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
>
>
> As far as I can tell whilst this will make multilib work on the target
> device, since you've removed this patch, the actual -cross toolchains
> used for multilib builds will be broken since they may or may not look
> in the correct libdir?
>
> Cheers,
>
> Richard
>
Hi Richard,
This is not an issue. do_gcc_multilib_setup() is always configuring the gcc multilib files. For cross gcc recipes it is only using DEFAULTTUNE while for target it is using DEFAULTTUNE & MULTILIB_VARIENTS. Also in my testing cross gcc recipes did not have any such issues.
Thanks,
Nitin
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 8/8] gcc: enable multilib for target gcc
2012-03-15 2:02 [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits nitin.a.kamble
` (6 preceding siblings ...)
2012-03-15 2:02 ` [PATCH 7/8] gcc: remove the 64bithack patch nitin.a.kamble
@ 2012-03-15 2:02 ` nitin.a.kamble
2012-03-15 2:42 ` McClintock Matthew-B29882
2012-03-15 2:47 ` McClintock Matthew-B29882
2012-03-21 18:59 ` [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits Saul Wold
8 siblings, 2 replies; 22+ messages in thread
From: nitin.a.kamble @ 2012-03-15 2:02 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
add a task to setup multilib configuration for target gcc.
This commit modifies target gcc, in such a way that it supports
configured multilib targets output.
Tested this, and this works on the target now.
root@qemux86-64:~# gcc -m64 t.c -o t
root@qemux86-64:~# file t
t: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 2.6.16, not stripped
root@qemux86-64:~# ./t
Hello World !
root@qemux86-64:~# gcc -m32 t.c -o t
root@qemux86-64:~# file t
t: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 2.6.16, not stripped
root@qemux86-64:~# ./t
Hello World !
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-devtools/gcc/gcc-common.inc | 23 +++
meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +-
meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 +
meta/recipes-devtools/gcc/gcc-multilib-config.inc | 155 ++++++++++++++++++++
meta/recipes-devtools/gcc/libgcc_4.6.bb | 42 ++++++
5 files changed, 222 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index f550aab..b371ba1 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -34,6 +34,29 @@ def get_gcc_multiarch_setting(bb, d):
return multiarch_options[target_arch]
return ""
+# this is used by the multilib setup of gcc
+def get_tune_parameters (tune, d) :
+ availtunes = d.getVar('AVAILTUNES', True)
+ if tune not in availtunes.split():
+ bb.error('The tune: %s is not one of the available tunes: %s', tune, availtunes)
+
+ localdata = bb.data.createCopy(d)
+ override = ':tune-' + tune
+ localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', False) + override)
+ bb.data.update_data(localdata)
+
+ retdict = {}
+ retdict['tune'] = tune
+ retdict['ccargs'] = localdata.getVar('TUNE_CCARGS', True)
+ retdict['features'] = localdata.getVar('TUNE_FEATURES', True)
+ retdict['baselib'] = localdata.getVar('BASE_LIB', True)
+ retdict['arch'] = localdata.getVar('TUNE_ARCH', True)
+ retdict['abiextension'] = localdata.getVar('ABIEXTENSION', True)
+ retdict['target_fpu'] = localdata.getVar('TARGET_FPU', True)
+ retdict['pkgarch'] = localdata.getVar('TUNE_PKGARCH', True)
+ retdict['package_extra_archs'] = localdata.getVar('PACKAGE_EXTRA_ARCHS', True)
+ return retdict
+
# We really need HOST_SYS here for some packages and TARGET_SYS for others.
# For now, libgcc is most important so we fix for that - RP.
SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs"
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 7a96e91..6933a70 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -25,7 +25,7 @@ EXTRA_OECONF_PATHS ?= ""
EXTRA_OECONF_INITIAL ?= ""
EXTRA_OECONF_INTERMEDIATE ?= ""
-GCCMULTILIB = "--disable-multilib"
+GCCMULTILIB ?= "--disable-multilib"
EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', True) != 'no']} \
--with-gnu-ld \
diff --git a/meta/recipes-devtools/gcc/gcc-configure-target.inc b/meta/recipes-devtools/gcc/gcc-configure-target.inc
index 8b169a7..9001bcf 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-target.inc
@@ -1,4 +1,5 @@
require gcc-configure-common.inc
+require gcc-multilib-config.inc
EXTRA_OECONF_PATHS = " \
--with-local-prefix=${STAGING_DIR_TARGET}${prefix} \
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
new file mode 100644
index 0000000..8c7706e
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -0,0 +1,155 @@
+GCCMULTILIB = "--enable-multilib"
+
+addtask gcc_multilib_setup after do_patch before do_configure
+
+# following code modifies these definitions in the gcc config
+# MULTILIB_OPTIONS
+# MULTILIB_DIRNAMES
+# MULTILIB_OSDIRNAMES
+# GLIBC_DYNAMIC_LINKER32
+# GLIBC_DYNAMIC_LINKER64
+# GLIBC_DYNAMIC_LINKERX32
+# GLIBC_DYNAMIC_LINKERN32
+# For more information on use of these variables look at these files in the gcc source code
+# gcc/config/i386/t-linux64
+# gcc/config/i386/t-linux
+# gcc/config/mips/t-linux64
+# gcc/config/mips/t-linux
+# gcc/config/rs6000/t-linux64
+# gcc/config/i386/linux64.h
+# gcc/config/i386/linux.h
+# gcc/config/mips/linux64.h
+# gcc/config/rs6000/linux64.h
+# gcc/config/rs6000/linux.h
+# Nitin Kamble 2012/02/13
+
+python do_gcc_multilib_setup() {
+ import re
+
+ # do this only for target recipe
+ if d.getVar('PN', True) != 'gcc':
+ return
+
+ srcdir = d.getVar('S', True)
+ multilibs = d.getVar('MULTILIB_VARIANTS', True)
+ target_arch = d.getVar('TARGET_ARCH', True)
+
+ gcc_target_config_files = {
+ 'x86_64' : ['gcc/config/i386/t-linux64', 'gcc/config/i386/t-linux'],
+ 'i586' : ['gcc/config/mips/t-linux'],
+ 'mips' : ['gcc/config/mips/t-linux64', 'gcc/config/mips/t-linux'],
+ 'ppc' : ['gcc/config/rs6000/t-linux64'] }
+
+ gcc_header_config_files = {
+ 'x86_64' : ['gcc/config/i386/linux64.h'],
+ 'i586' : ['gcc/config/mips/linux.h'],
+ 'mips' : ['gcc/config/mips/linux64.h', 'gcc/config/mips/linux.h'],
+ 'ppc' : ['gcc/config/rs6000/linux64.h', 'gcc/config/rs6000/linux.h'] }
+
+ if target_arch not in gcc_target_config_files:
+ bb.warn('gcc multilib setup is not supported for TARGET_ARCH=' + target_arch)
+ return
+
+ gcc_multilib_target_config_files = gcc_target_config_files[target_arch]
+ gcc_multilib_header_config_files = gcc_header_config_files[target_arch]
+
+ ml_list = ['DEFAULTTUNE']
+ if multilibs != '':
+ for ml in multilibs.split(' '):
+ ml_list.append('DEFAULTTUNE_virtclass-multilib-' + ml)
+
+ libdir32 = 'SYSTEMLIBS_DIR'
+ libdir64 = 'SYSTEMLIBS_DIR'
+ libdirx32 = 'SYSTEMLIBS_DIR'
+ libdirn32 = 'SYSTEMLIBS_DIR'
+
+ multilib_options = []
+ multilib_dirnames = []
+ multilib_osdirnames = []
+
+ for ml in ml_list:
+ tune = d.getVar(ml, True)
+ tune_parameters = get_tune_parameters(tune, d)
+ for a, b in tune_parameters.iteritems():
+ bb.warn(a + ': ' + b)
+
+ tune_baselib = tune_parameters['baselib']
+
+ if tune_baselib == 'lib64':
+ libdir64 = tune_baselib
+ elif tune_baselib == 'libx32':
+ libdirx32 = tune_baselib
+ elif tune_baselib == 'lib32':
+ libdirn32 = tune_baselib
+ elif tune_baselib == 'lib':
+ libdir32 = tune_baselib
+ else:
+ bb.error('Unknown libdir (%s) of the tune : %s' % (tune_baselib, tune))
+
+ # take out '-' in parameters
+ multilib_options.append(re.sub(r' +\-+', ' ', re.sub(r'^ *\-+', '', tune_parameters['ccargs'])))
+ if tune_baselib == 'lib':
+ multilib_dirnames.append('32') # /lib => 32bit lib
+ else:
+ multilib_dirnames.append(tune_baselib.replace('lib', ''))
+ multilib_osdirnames.append('../' + tune_baselib)
+
+ # go over t-linux64 kind target files
+ for ml_conf_file in gcc_multilib_target_config_files:
+ with open(srcdir + '/' + ml_conf_file, 'r') as f:
+ filelines = f.read()
+ f.close()
+
+ # recreate multilib configuration variables
+
+ filelines = re.sub(r'^\s*MULTILIB_OPTIONS\s*=.*$',
+ 'MULTILIB_OPTIONS = ' + '/'.join(multilib_options),
+ filelines, flags=re.MULTILINE)
+
+ filelines = re.sub(r'^\s*MULTILIB_DIRNAMES\s*=.*$',
+ 'MULTILIB_DIRNAMES = ' + ' '.join(multilib_dirnames),
+ filelines, flags=re.MULTILINE)
+
+ filelines = re.sub(r'^\s*MULTILIB_OSDIRNAMES\s*=.*$',
+ 'MULTILIB_OSDIRNAMES = ' + ' '.join(multilib_osdirnames),
+ filelines, flags=re.MULTILINE)
+
+ with open(srcdir + '/' + ml_conf_file, 'w') as f:
+ f.write(filelines)
+ f.close()
+ with open('/tmp/ml.out', 'w') as f:
+ f.write(filelines)
+ f.close()
+
+ # go over linux64.h kind header files
+ for ml_conf_file in gcc_multilib_header_config_files:
+ with open(srcdir + '/' + ml_conf_file, 'r') as f:
+ filelines = f.read()
+ f.close()
+
+ # replace lines like
+ # #define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
+ # by
+ # #define GLIBC_DYNAMIC_LINKER32 "/lib/" "ld-linux.so.2"
+ # this is needed to put the correct dynamic loader path in the generated binaries
+
+ filelines = re.sub(r'^(#define\s*GLIBC_DYNAMIC_LINKER32\s*)(SYSTEMLIBS_DIR)(\s*\".*\")$',
+ r'\1"/' + libdir32 + r'/"\3',
+ filelines, flags=re.MULTILINE)
+
+ filelines = re.sub(r'^(#define\s*GLIBC_DYNAMIC_LINKER64\s*)(SYSTEMLIBS_DIR)(\s*\".*\")$',
+ r'\1"/' + libdir64 + r'/"\3',
+ filelines, flags=re.MULTILINE)
+
+ filelines = re.sub(r'^(#define\s*GLIBC_DYNAMIC_LINKERX32\s*)(SYSTEMLIBS_DIR)(\s*\".*\")$',
+ r'\1"/' + libdirx32 + r'/"\3',
+ filelines, flags=re.MULTILINE)
+
+ filelines = re.sub(r'^(#define\s*GLIBC_DYNAMIC_LINKERN32\s*)(SYSTEMLIBS_DIR)(\s*\".*\")$',
+ r'\1"/' + libdirn32 + r'/"\3',
+ filelines, flags=re.MULTILINE)
+
+ with open(srcdir + '/' + ml_conf_file, 'w') as f:
+ f.write(filelines)
+ f.close()
+}
diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb
index 04e2877..6a13e73 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
@@ -14,6 +14,9 @@ FILES_${PN} = "${base_libdir}/libgcc*.so.*"
FILES_${PN}-dev = " \
${base_libdir}/libgcc*.so \
${libdir}/${TARGET_SYS}/${BINV}/crt* \
+ ${libdir}/${TARGET_SYS}/${BINV}/32 \
+ ${libdir}/${TARGET_SYS}/${BINV}/x32 \
+ ${libdir}/${TARGET_SYS}/${BINV}/n32 \
${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
FILES_libgcov-dev = " \
${libdir}/${TARGET_SYS}/${BINV}/libgcov.a"
@@ -51,3 +54,42 @@ BBCLASSEXTEND = "nativesdk"
INSANE_SKIP_libgcc-dev = "staticdev"
INSANE_SKIP_libgcov-dev = "staticdev"
+addtask multilib_install after do_install before do_package
+# this makes multilib gcc files findable for target gcc
+# like this directory is made findable
+# /usr/lib/i586-pokymllib32-linux/4.6.3/
+# by creating this symlink to it
+# /usr/lib64/x86_64-poky-linux/4.6.3/32
+
+python do_multilib_install() {
+ import re
+ # do this only for multilib extended recipe
+ if d.getVar('PN', True) != 'libgcc':
+ return
+
+ multilibs = d.getVar('MULTILIB_VARIANTS', True) or ''
+ if multilibs == '':
+ return
+
+ binv = d.getVar('BINV', True) or ''
+
+ for ml in multilibs.split(' '):
+ tune = d.getVar('DEFAULTTUNE_virtclass-multilib-' + ml, True) or ''
+ tune_parameters = get_tune_parameters(tune, d)
+ tune_baselib = tune_parameters['baselib']
+ tune_arch = tune_parameters['arch']
+ tune_bitness = tune_baselib.replace('lib', '')
+ if tune_bitness == '' :
+ tune_bitness = '32' # /lib => 32bit lib
+
+ src = '../../../' + tune_baselib + '/' + \
+ tune_arch + d.getVar('TARGET_VENDOR', True) + 'ml' + ml + \
+ '-' + d.getVar('TARGET_OS', True) + '/' + binv + '/'
+
+ dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + \
+ d.getVar('TARGET_SYS', True) + '/' + binv + '/' + tune_bitness
+
+ if os.path.lexists(dest):
+ os.unlink(dest)
+ os.symlink(src, dest)
+}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 8/8] gcc: enable multilib for target gcc
2012-03-15 2:02 ` [PATCH 8/8] gcc: enable multilib for target gcc nitin.a.kamble
@ 2012-03-15 2:42 ` McClintock Matthew-B29882
2012-03-15 15:50 ` Kamble, Nitin A
2012-03-15 2:47 ` McClintock Matthew-B29882
1 sibling, 1 reply; 22+ messages in thread
From: McClintock Matthew-B29882 @ 2012-03-15 2:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, Mar 14, 2012 at 9:02 PM, <nitin.a.kamble@intel.com> wrote:
> ${libdir}/${TARGET_SYS}/${BINV}/crt* \
> + ${libdir}/${TARGET_SYS}/${BINV}/32 \
> + ${libdir}/${TARGET_SYS}/${BINV}/x32 \
> + ${libdir}/${TARGET_SYS}/${BINV}/n32 \
Would ${libdir}/${TARGET_SYS}/${BINV}/64 ever exist?
-M
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 8/8] gcc: enable multilib for target gcc
2012-03-15 2:42 ` McClintock Matthew-B29882
@ 2012-03-15 15:50 ` Kamble, Nitin A
0 siblings, 0 replies; 22+ messages in thread
From: Kamble, Nitin A @ 2012-03-15 15:50 UTC (permalink / raw)
To: McClintock Matthew-B29882,
Patches and discussions about the oe-core layer
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> McClintock Matthew-B29882
> Sent: Wednesday, March 14, 2012 7:43 PM
> To: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH 8/8] gcc: enable multilib for target gcc
>
> On Wed, Mar 14, 2012 at 9:02 PM, <nitin.a.kamble@intel.com> wrote:
> > ${libdir}/${TARGET_SYS}/${BINV}/crt* \
> > + ${libdir}/${TARGET_SYS}/${BINV}/32 \
> > + ${libdir}/${TARGET_SYS}/${BINV}/x32 \
> > + ${libdir}/${TARGET_SYS}/${BINV}/n32 \
>
> Would ${libdir}/${TARGET_SYS}/${BINV}/64 ever exist?
>
> -M
It will exist. Thanks for catching this.
Nitin
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 8/8] gcc: enable multilib for target gcc
2012-03-15 2:02 ` [PATCH 8/8] gcc: enable multilib for target gcc nitin.a.kamble
2012-03-15 2:42 ` McClintock Matthew-B29882
@ 2012-03-15 2:47 ` McClintock Matthew-B29882
2012-03-15 8:26 ` Richard Purdie
1 sibling, 1 reply; 22+ messages in thread
From: McClintock Matthew-B29882 @ 2012-03-15 2:47 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, Mar 14, 2012 at 9:02 PM, <nitin.a.kamble@intel.com> wrote:
> + multilibs = d.getVar('MULTILIB_VARIANTS', True)
> + target_arch = d.getVar('TARGET_ARCH', True)
> +
> + gcc_target_config_files = {
> + 'x86_64' : ['gcc/config/i386/t-linux64', 'gcc/config/i386/t-linux'],
> + 'i586' : ['gcc/config/mips/t-linux'],
> + 'mips' : ['gcc/config/mips/t-linux64', 'gcc/config/mips/t-linux'],
> + 'ppc' : ['gcc/config/rs6000/t-linux64'] }
> +
> + gcc_header_config_files = {
> + 'x86_64' : ['gcc/config/i386/linux64.h'],
> + 'i586' : ['gcc/config/mips/linux.h'],
> + 'mips' : ['gcc/config/mips/linux64.h', 'gcc/config/mips/linux.h'],
> + 'ppc' : ['gcc/config/rs6000/linux64.h', 'gcc/config/rs6000/linux.h'] }
> +
> + if target_arch not in gcc_target_config_files:
> + bb.warn('gcc multilib setup is not supported for TARGET_ARCH=' + target_arch)
> + return
> +
> + gcc_multilib_target_config_files = gcc_target_config_files[target_arch]
> + gcc_multilib_header_config_files = gcc_header_config_files[target_arch]
> +
> + ml_list = ['DEFAULTTUNE']
> + if multilibs != '':
> + for ml in multilibs.split(' '):
> + ml_list.append('DEFAULTTUNE_virtclass-multilib-' + ml)
What about adding non-multilib variants? I want to make one toolchain
for ppce500v2, ppce500mc, ppce5550, and ppc64e5500?
Also, somehow, should we enforce all "toolchains" are built through
this multilib build process such that I only need to configure things
properly and then theoretically I can make a toolchain ONCE that
supports all desired targets? E.g. I don't think we want references to
DEFAULTTUNE since I don't want the DEFAULTTUNE to matter? Does this
make any sense?
-M
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 8/8] gcc: enable multilib for target gcc
2012-03-15 2:47 ` McClintock Matthew-B29882
@ 2012-03-15 8:26 ` Richard Purdie
2012-03-15 14:56 ` McClintock Matthew-B29882
0 siblings, 1 reply; 22+ messages in thread
From: Richard Purdie @ 2012-03-15 8:26 UTC (permalink / raw)
To: McClintock Matthew-B29882,
Patches and discussions about the oe-core layer
On Thu, 2012-03-15 at 02:47 +0000, McClintock Matthew-B29882 wrote:
> On Wed, Mar 14, 2012 at 9:02 PM, <nitin.a.kamble@intel.com> wrote:
> > + multilibs = d.getVar('MULTILIB_VARIANTS', True)
> > + target_arch = d.getVar('TARGET_ARCH', True)
> > +
> > + gcc_target_config_files = {
> > + 'x86_64' : ['gcc/config/i386/t-linux64', 'gcc/config/i386/t-linux'],
> > + 'i586' : ['gcc/config/mips/t-linux'],
> > + 'mips' : ['gcc/config/mips/t-linux64', 'gcc/config/mips/t-linux'],
> > + 'ppc' : ['gcc/config/rs6000/t-linux64'] }
> > +
> > + gcc_header_config_files = {
> > + 'x86_64' : ['gcc/config/i386/linux64.h'],
> > + 'i586' : ['gcc/config/mips/linux.h'],
> > + 'mips' : ['gcc/config/mips/linux64.h', 'gcc/config/mips/linux.h'],
> > + 'ppc' : ['gcc/config/rs6000/linux64.h', 'gcc/config/rs6000/linux.h'] }
> > +
> > + if target_arch not in gcc_target_config_files:
> > + bb.warn('gcc multilib setup is not supported for TARGET_ARCH=' + target_arch)
> > + return
> > +
> > + gcc_multilib_target_config_files = gcc_target_config_files[target_arch]
> > + gcc_multilib_header_config_files = gcc_header_config_files[target_arch]
> > +
> > + ml_list = ['DEFAULTTUNE']
> > + if multilibs != '':
> > + for ml in multilibs.split(' '):
> > + ml_list.append('DEFAULTTUNE_virtclass-multilib-' + ml)
>
> What about adding non-multilib variants? I want to make one toolchain
> for ppce500v2, ppce500mc, ppce5550, and ppc64e5500?
>
> Also, somehow, should we enforce all "toolchains" are built through
> this multilib build process such that I only need to configure things
> properly and then theoretically I can make a toolchain ONCE that
> supports all desired targets? E.g. I don't think we want references to
> DEFAULTTUNE since I don't want the DEFAULTTUNE to matter? Does this
> make any sense?
Whilst I understand the desire, this is not what the patch series is
intended for and I don't think it reasonable to try and change the patch
series to fit that requirement.
The big issue you face trying to do the above is iterating over the
toolchain building libgcc and libc for each of the variants you mention.
This is particularly hard since at least in the multilib case they have
different libdir paths, in your non-multilib case, they would overlap.
So no, I don't think its possible to do what you describe in this
context.
Cheers,
Richard
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 8/8] gcc: enable multilib for target gcc
2012-03-15 8:26 ` Richard Purdie
@ 2012-03-15 14:56 ` McClintock Matthew-B29882
0 siblings, 0 replies; 22+ messages in thread
From: McClintock Matthew-B29882 @ 2012-03-15 14:56 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: McClintock Matthew-B29882
On Thu, Mar 15, 2012 at 3:26 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Whilst I understand the desire, this is not what the patch series is
> intended for and I don't think it reasonable to try and change the patch
> series to fit that requirement.
Not insisting on anything just spurring further conversation...
> The big issue you face trying to do the above is iterating over the
> toolchain building libgcc and libc for each of the variants you mention.
> This is particularly hard since at least in the multilib case they have
> different libdir paths, in your non-multilib case, they would overlap.
>
> So no, I don't think its possible to do what you describe in this
> context.
I'm not sure of all the issues, but I know we make toolchains that
support all Freescale parts - that's something I'm looking to
reproduce with Yocto at some point.
Also, regarding multilib recipes (not gcc) have you given though to
having multilib sort of always in effect? I.E if I build a
lib32-binutils on a 64-bit machine - it should go generate the
sstate-cache that could be reused by a pure 32-bit machine?
Basically we are creating these one-off sstate-caches for this
scenario... sstate for lib64 on a lib32 machine or vice versa...
-M
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits
2012-03-15 2:02 [PATCH 0/8] fixes, recipe upgrades, & gcc multilib enabling commits nitin.a.kamble
` (7 preceding siblings ...)
2012-03-15 2:02 ` [PATCH 8/8] gcc: enable multilib for target gcc nitin.a.kamble
@ 2012-03-21 18:59 ` Saul Wold
8 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-03-21 18:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 03/14/2012 07:02 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>
> For more information look at the individual commit logs.
>
> The following changes since commit 8bae18bb358755131f13865abb279ac687a03848:
>
> slang: Fix rpath QA warnings (2012-03-15 00:11:40 +0000)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib gcc-multilib-2-for-push
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gcc-multilib-2-for-push
>
> Nitin A Kamble (8):
> gmp: upgrade from 5.0.3 to 5.0.4
Merged
> automake: upgrade from 1.11.2 to 1.11.3
Holding on on this change due to issue already seen.
> distro-tracking: update status of recipes
> ncurses: fix install error
> python: fix install when libdir is not "lib"
Merged these into OE-Core
> multilib.conf: add other abi packages to target gcc's dependencies
> gcc: remove the 64bithack patch
> gcc: enable multilib for target gcc
>
We are going to hold off on the multilib changes for after 1.2
Thanks
Sau!
> .../conf/distro/include/distro_tracking_fields.inc | 24 ++--
> meta/conf/multilib.conf | 3 +
> meta/recipes-core/ncurses/ncurses.inc | 2 +-
> meta/recipes-devtools/automake/automake.inc | 2 +-
> ...utomake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch | 118 ---------------
> .../prefer-cpio-over-pax-for-ustar-archives.patch | 30 ++--
> .../automake/automake/python-libdir.patch | 32 ++---
> .../{automake_1.11.2.bb => automake_1.11.3.bb} | 8 +-
> meta/recipes-devtools/gcc/gcc-4.6.inc | 1 -
> meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch | 68 ---------
> meta/recipes-devtools/gcc/gcc-common.inc | 23 +++
> meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +-
> meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 +
> meta/recipes-devtools/gcc/gcc-multilib-config.inc | 155 ++++++++++++++++++++
> meta/recipes-devtools/gcc/libgcc_4.6.bb | 42 ++++++
> .../python/fix_for_using_different_libdir.patch | 78 ++++++++++
> meta/recipes-devtools/python/python_2.7.2.bb | 3 +-
> meta/recipes-support/gmp/gmp/gmp_bugfix.patch | 94 ------------
> .../gmp/{gmp_5.0.3.bb => gmp_5.0.4.bb} | 7 +-
> 19 files changed, 358 insertions(+), 335 deletions(-)
> delete mode 100644 meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
> rename meta/recipes-devtools/automake/{automake_1.11.2.bb => automake_1.11.3.bb} (85%)
> delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
> create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc
> create mode 100644 meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
> delete mode 100644 meta/recipes-support/gmp/gmp/gmp_bugfix.patch
> rename meta/recipes-support/gmp/{gmp_5.0.3.bb => gmp_5.0.4.bb} (54%)
>
^ permalink raw reply [flat|nested] 22+ messages in thread