lsof: fix LSOF_CCV in version.h

PATCH New [email protected] 1 participant 2 messages Oct 23, 2014

lore

Share & tools

lore

[email protected]

author

2014-10-23 08:21 UTC #0 lore raw

v2 cover lsof: fix LSOF_CCV in version.h

From: Wenzong Fan <[email protected]>

v2 changes:
* pass LSOF_CC to configure
* change the LSOF_CCV assignment to run LSOF_CC get the version of linux compiler.

The following changes since commit 924da20c6f2f183fa7e930e4c3c6b14c090acbe5:

build-appliance-image: Update to dizzy head revision (2014-10-18 16:16:38 +0200)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib wenzong/lsof
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/lsof

Wenzong Fan (1):
lsof: fix LSOF_CCV in version.h

 .../files/Configure-fix-LSOF_CCV-assignment.patch  |   31 ++++++++++++++++++++
 meta/recipes-extended/lsof/lsof_4.87.bb            |    5 +++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch

Signature · 1 line

1.7.9.5

[email protected]

author

2014-10-23 08:21 UTC #1 lore raw

PATCH v2 1/1 lsof: fix LSOF_CCV in version.h

From: Wenzong Fan <[email protected]>

When using cross compiler to build the package "lsof" on a host, the value of LSOF_CCV in version.h genegrated by the Makefile is the version of the compiler on the host while it should be the version of cross compiler.

On Ubuntu host before fixed:
#define LSOF_CCV "4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5) "

After fixed:
#define LSOF_CCV "4.9.1 (GCC) "

Signed-off-by Wenzong Fan <[email protected]>

---
 .../files/Configure-fix-LSOF_CCV-assignment.patch  |   31 ++++++++++++++++++++
 meta/recipes-extended/lsof/lsof_4.87.bb            |    5 +++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch

meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch new file +31 -0

new file mode 100644
index 0000000..a182925
@@ -0,0 +1,31 @@
+From c197389c9d8ccdbfcfe1dc31da6b4ce69b90ecf6 Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <[email protected]>
+Date: Thu, 23 Oct 2014 03:43:27 -0400
+Subject: [PATCH] Configure: fix LSOF_CCV assignment
+
+Allow to use specified LSOF_CC to get the version of linux compiler.
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <[email protected]>
+---
+ Configure |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Configure b/Configure
+index 29c1292..e5a199f 100755
+--- a/Configure
++++ b/Configure
+@@ -2705,8 +2705,8 @@ LOCKF_OWNER4
+     if test "X$LSOF_CC" = "X"	# {
+     then
+       LSOF_CC=cc
+-      LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
+     fi	# }
++    LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
+     if test "X$LINUX_CONF_CC" = "X"	# {
+     then
+       LINUX_CONF_CC=$LSOF_CC
+-- 
+1.7.9.5
+

meta/recipes-extended/lsof/lsof_4.87.bb +4 -1

index e7a1eb2..6d1c0d0 100644
@@ -4,7 +4,9 @@ Its name stands for LiSt Open Files, and it does just that."
 SECTION = "devel"
 LICENSE = "BSD"
 
-SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2"
+SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2 \
+           file://Configure-fix-LSOF_CCV-assignment.patch \
+          "
 
 SRC_URI[md5sum] = "80e2a76d0e05826db910ec88e631296c"
 SRC_URI[sha256sum] = "dfdd3709d82bc79ccdf3e404b84aafa9aede5948642a824ecaefd0aac589da2c"

@@ -28,6 +30,7 @@ LSOF_OS_libc-glibc = "linux"
 export LSOF_INCLUDE = "${STAGING_INCDIR}"
 
 do_configure () {
+	export LSOF_CC="${CC}"
 	export LSOF_AR="${AR} cr"
 	export LSOF_RANLIB="${RANLIB}"
         if [ "x${GLIBCVERSION}" != "x" ];then

Signature · 1 line

1.7.9.5