Skip to contentSkip to conversation

Various Fixes

PATCH In review [email protected] 3 participants 6 messages Nov 23, 2011 – Nov 24, 2011

lore
Share & tools
lore
#0 lore raw

cover Various Fixes

From: Nitin A Kamble <[email protected]>

This set has fixes for gmp, at & site/x86-64-linux

- Nitin

The following changes since commit 40fe6457d5ca49fe113bc26c60d5add59d85b34f:

matchbox-wm: Fix variable type in _NET_WORKAREA setting (2011-11-22 15:13:26 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc

Nitin A Kamble (3):
gmp: also generate the libgmpcxx library
at: update the upstream-status of patches
site/x86_64-linux: add cvs config variables

 .../at/at-3.1.12/configure-add-enable-pam.patch    |    5 +++++
 meta/recipes-extended/at/at-3.1.12/pam.conf.patch  |    3 +++
 .../at/files/file_replacement_with_gplv2.patch     |    2 ++
 .../at/files/nonstripbinaries.patch                |    1 +
 meta/recipes-extended/at/files/use-ldflags.patch   |    5 +++++
 meta/recipes-support/gmp/gmp.inc                   |    4 ++++
 meta/recipes-support/gmp/gmp_4.2.1.bb              |    2 +-
 meta/recipes-support/gmp/gmp_5.0.2.bb              |    2 +-
 meta/site/x86_64-linux                             |    3 +++
 9 files changed, 25 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.6.4
#1 lore raw

PATCH 1/3 gmp: also generate the libgmpcxx library

From: Nitin A Kamble <[email protected]>

configure runs few checks to make sure c++ compiler and runtime are working as expected with the --enable-cxx=detect option.

Added a LEAD_SONAME line to avoid change in generated package names.

---
 meta/recipes-support/gmp/gmp.inc      |    4 ++++
 meta/recipes-support/gmp/gmp_4.2.1.bb |    2 +-
 meta/recipes-support/gmp/gmp_5.0.2.bb |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
meta/recipes-support/gmp/gmp.inc +4 -0
index 66349e6..10c3b9d 100644
@@ -14,3 +14,7 @@ ARM_INSTRUCTION_SET = "arm"
 acpaths = ""
 
 BBCLASSEXTEND = "native nativesdk"
+
+EXTRA_OECONF += " --enable-cxx=detect"
+
+LEAD_SONAME = "libgmp.so"
meta/recipes-support/gmp/gmp_4.2.1.bb +1 -1
index 74da6b8..97ac4b2 100644
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \
                     file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
                     file://gmp-h.in;startline=6;endline=21;md5=5e25ffd16996faba8c1cd27b04b16099"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/gmp/${BP}.tar.bz2 \
            file://disable-stdc.patch"
meta/recipes-support/gmp/gmp_5.0.2.bb +1 -1
index 16bdcbc..873fc3e 100644
@@ -2,7 +2,7 @@ require gmp.inc
 LICENSE="LGPLv3&GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 		    file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
-PR = "r1"
+PR = "r2"
 
 SRC_URI_append += "file://sh4-asmfix.patch \
                    file://use-includedir.patch "
Signature · 1 line
1.7.6.4
#2 lore raw

PATCH 2/3 at: update the upstream-status of patches

From: Nitin A Kamble <[email protected]>

---
 .../at/at-3.1.12/configure-add-enable-pam.patch    |    5 +++++
 meta/recipes-extended/at/at-3.1.12/pam.conf.patch  |    3 +++
 .../at/files/file_replacement_with_gplv2.patch     |    2 ++
 .../at/files/nonstripbinaries.patch                |    1 +
 meta/recipes-extended/at/files/use-ldflags.patch   |    5 +++++
 5 files changed, 16 insertions(+), 0 deletions(-)
meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch +5 -0
index 1f73cdd..a6b7969 100644
@@ -1,3 +1,8 @@
+Upstream-Status: Pending
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2011/11/21
+
 --- at-3.1.12/configure.ac	2011-06-23 14:51:03.653572945 +0800
 +++ at-3.1.12/configure.ac.new	2011-06-27 16:12:14.903572945 +0800
 @@ -81,10 +81,18 @@
meta/recipes-extended/at/at-3.1.12/pam.conf.patch +3 -0
index dfe76d7..f616cea 100644
@@ -2,6 +2,9 @@ oe doesn't support "@include", use the concrete directive instead.
 
 Upstream-Status: Pending
 
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2011/11/21
+
 Signed-off-by: Wenzong Fan <[email protected]>
 --- at-3.1.12/pam.conf.orig	2009-11-23 23:11:52.000000000 +0800
 +++ at-3.1.12/pam.conf	2011-07-15 11:14:04.132818950 +0800
meta/recipes-extended/at/files/file_replacement_with_gplv2.patch +2 -0
index 249902c..d5ef003 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 posixtm.[ch] files are replaced with gplv2 version from these locations:
 
 http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/posixtm.c;hb=5661ab9d49512b4cf3c19caa11bb581d8ce561ba
meta/recipes-extended/at/files/nonstripbinaries.patch +1 -0
index a1aee5f..2b251db 100644
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 #Because remove nonrootinstall patch, the stripping of the binaries can not
 #be handled.
 #This patch is to handle the stripping of the binaries.
meta/recipes-extended/at/files/use-ldflags.patch +5 -0
index 7d3d91a..b533598 100644
@@ -1,6 +1,11 @@
+Upstream-Status: Pending
+
 # Ensure use of $LDFLAGS during build
 # Derived from an OE patch for at-3.1.8
 
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2011/11/21
+
 --- at-3.1.12.orig/Makefile.in	2009-11-23 07:11:52.000000000 -0800
 +++ at-3.1.12/Makefile.in	2010-07-20 16:28:04.000000000 -0700
 @@ -65,13 +65,13 @@
Signature · 1 line
1.7.6.4
#3 lore raw

PATCH 3/3 site/x86_64-linux: add cvs config variables

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

configure of cvs packages was failing on the meta-toolchain for a x86_64 target.

Configure error reported:
checking whether printf supports %p... configure: error: cannot run test program while cross compiling

This fixes [YOCTO #1781]

---
 meta/site/x86_64-linux |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/site/x86_64-linux +3 -0
index 3fa8f1e..a0a9362 100644
@@ -118,3 +118,6 @@ ac_cv_func___lshrdi3=no
 ac_cv_func___trampoline_setup=no
 ac_cv_func___ucmpdi2=no
 ac_cv_func__restgpr_14_x=no
+
+# cvs
+cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes}
Signature · 1 line
1.7.6.4
#4 lore raw

Re: [PATCH 1/3] gmp: also generate the libgmpcxx library

In reply to [email protected]

meta/recipes-support/gmp/gmp.inc ARM_INSTRUCTION_SET = "arm" · line 20

Quoted 12 lines · On Tue, 2011-11-22 at 21:55 -0800, [email protected] wrote:
meta/recipes-support/gmp/gmp.inc +4 -0
index 66349e6..10c3b9d 100644
@@ -14,3 +14,7 @@ ARM_INSTRUCTION_SET = "arm"
 acpaths = ""
 
 BBCLASSEXTEND = "native nativesdk"
+
+EXTRA_OECONF += " --enable-cxx=detect"
+
+LEAD_SONAME = "libgmp.so"

I think it would be better to put the C++ libraries in a separate package, otherwise you will waste on-target space for the people who don't need them (which, presumably, is everyone who was using gmp prior to your patch). LEAD_SONAME is almost never a good thing to use.

p.

#5 lore raw
In reply to [email protected]
Quoted 8 lines · On Tue, 2011-11-22 at 21:55 -0800, [email protected] wrote:

From: Nitin A Kamble <[email protected]>

This set has fixes for gmp, at & site/x86-64-linux

- Nitin

The following changes since commit 40fe6457d5ca49fe113bc26c60d5add59d85b34f:

Quoted 8 lines

matchbox-wm: Fix variable type in _NET_WORKAREA setting (2011-11-22 15:13:26 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc

Nitin A Kamble (3):
gmp: also generate the libgmpcxx library

This one needs the C++ piece split into a separate package please.

Quoted 2 lines

at: update the upstream-status of patches
site/x86_64-linux: add cvs config variables

These two have merged, thanks!

Richard