Patchwork libzypp: Fix buiild with gcc 4.7

login
register
mail settings
Submitter Khem Raj
Date March 23, 2012, 3:37 p.m.
Message ID <1332517070-31174-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/24317/
State Accepted
Commit 046a236bf0e6005ccc8af7c1449a4fa2e1e9e91c
Headers show

Comments

Khem Raj - March 23, 2012, 3:37 p.m.
it needs protype of close() before using it

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-extended/libzypp/libzypp/close.patch |   32 +++++++++++++++++++++
 meta/recipes-extended/libzypp/libzypp_git.bb      |    3 +-
 2 files changed, 34 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-extended/libzypp/libzypp/close.patch
Saul Wold - April 3, 2012, 9:45 p.m.
On 03/23/2012 08:37 AM, Khem Raj wrote:
> it needs protype of close() before using it
>
> Signed-off-by: Khem Raj<raj.khem@gmail.com>
> ---
>   meta/recipes-extended/libzypp/libzypp/close.patch |   32 +++++++++++++++++++++
>   meta/recipes-extended/libzypp/libzypp_git.bb      |    3 +-
>   2 files changed, 34 insertions(+), 1 deletions(-)
>   create mode 100644 meta/recipes-extended/libzypp/libzypp/close.patch
>
> diff --git a/meta/recipes-extended/libzypp/libzypp/close.patch b/meta/recipes-extended/libzypp/libzypp/close.patch
> new file mode 100644
> index 0000000..0ff1825
> --- /dev/null
> +++ b/meta/recipes-extended/libzypp/libzypp/close.patch
> @@ -0,0 +1,32 @@
> +close() is used without a protype therefore we include unistd.h
> +Fixes compile errors like below
> +
> +/home/kraj/work/openembedded-core/build/tmp-eglibc/work/qemuppc-oe-linux/libzypp-0.0-git1+15b6c52260bbc52b3d8e585e271b67e10cc7c433-r18/git/zypp/ExternalProgram.h:239:47: error: '::close' has not been declared
> +
> +Signed-off-by: Khem Raj<raj.khem@gmail.com>
> +
> +Upstream-Status: Pending
> +Index: git/zypp/ExternalProgram.h
> +===================================================================
> +--- git.orig/zypp/ExternalProgram.h	2012-03-23 08:27:31.716438539 -0700
> ++++ git/zypp/ExternalProgram.h	2012-03-23 08:27:54.520439367 -0700
> +@@ -16,6 +16,7 @@
> + #include<map>
> + #include<string>
> + #include<vector>
> ++#include<unistd.h>
> +
> + #include "zypp/base/ExternalDataSource.h"
> + #include "zypp/Pathname.h"
> +Index: git/zypp/base/Random.cc
> +===================================================================
> +--- git.orig/zypp/base/Random.cc	2012-03-23 08:31:09.732449118 -0700
> ++++ git/zypp/base/Random.cc	2012-03-23 08:31:36.240450324 -0700
> +@@ -3,6 +3,7 @@
> + #include<cstdio>
> + #include<iostream>
> + #include<fcntl.h>
> ++#include<unistd.h>
> + #include "zypp/base/Random.h"
> +
> + using namespace std;
> diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
> index 368cc06..78c7a6a 100644
> --- a/meta/recipes-extended/libzypp/libzypp_git.bb
> +++ b/meta/recipes-extended/libzypp/libzypp_git.bb
> @@ -11,7 +11,7 @@ DEPENDS  = "rpm boost curl libxml2 zlib sat-solver expat openssl udev"
>   S = "${WORKDIR}/git"
>   SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
>   PV = "0.0-git${SRCPV}"
> -PR = "r18"
> +PR = "r19"
>
>   SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
>              file://no-doc.patch \
> @@ -22,6 +22,7 @@ SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
>   	   file://libzypp-compatargs.patch \
>   	   file://fix_for_compile_wth_gcc-4.6.0.patch \
>   	   file://hardcode-lib-fix.patch \
> +	   file://close.patch \
>             "
>
>   SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"


Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-extended/libzypp/libzypp/close.patch b/meta/recipes-extended/libzypp/libzypp/close.patch
new file mode 100644
index 0000000..0ff1825
--- /dev/null
+++ b/meta/recipes-extended/libzypp/libzypp/close.patch
@@ -0,0 +1,32 @@ 
+close() is used without a protype therefore we include unistd.h
+Fixes compile errors like below
+
+/home/kraj/work/openembedded-core/build/tmp-eglibc/work/qemuppc-oe-linux/libzypp-0.0-git1+15b6c52260bbc52b3d8e585e271b67e10cc7c433-r18/git/zypp/ExternalProgram.h:239:47: error: '::close' has not been declared
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+Index: git/zypp/ExternalProgram.h
+===================================================================
+--- git.orig/zypp/ExternalProgram.h	2012-03-23 08:27:31.716438539 -0700
++++ git/zypp/ExternalProgram.h	2012-03-23 08:27:54.520439367 -0700
+@@ -16,6 +16,7 @@
+ #include <map>
+ #include <string>
+ #include <vector>
++#include <unistd.h>
+ 
+ #include "zypp/base/ExternalDataSource.h"
+ #include "zypp/Pathname.h"
+Index: git/zypp/base/Random.cc
+===================================================================
+--- git.orig/zypp/base/Random.cc	2012-03-23 08:31:09.732449118 -0700
++++ git/zypp/base/Random.cc	2012-03-23 08:31:36.240450324 -0700
+@@ -3,6 +3,7 @@
+ #include <cstdio>
+ #include <iostream>
+ #include <fcntl.h>
++#include <unistd.h>
+ #include "zypp/base/Random.h"
+ 
+ using namespace std;
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 368cc06..78c7a6a 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -11,7 +11,7 @@  DEPENDS  = "rpm boost curl libxml2 zlib sat-solver expat openssl udev"
 S = "${WORKDIR}/git"
 SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
 PV = "0.0-git${SRCPV}"
-PR = "r18"
+PR = "r19"
 
 SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
            file://no-doc.patch \
@@ -22,6 +22,7 @@  SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
 	   file://libzypp-compatargs.patch \
 	   file://fix_for_compile_wth_gcc-4.6.0.patch \
 	   file://hardcode-lib-fix.patch \
+	   file://close.patch \
           "
 
 SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"