mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

libzypp: Fix build with uclibc

Browse Source 
cstdio is included indrectly with eglibc based systems
but not with uclibc based systems and use of functions
like ::eof are then reported as warnings. Therefore
we include cstdio explicitly.

(From OE-Core rev: c9c74b1316aa671e7106962c9dae5b6046cd9946)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2012-06-04 15:09:10 -07:00
committed by Richard Purdie
parent de8b25deb3
commit 83b53d32eb
2 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/libzypp/libzypp/cstdio.patch
+49
View File
@@ -0,0 +1,49 @@
include cstdio to get definitions of ::xxx functions which
are now reported by gcc-4.7 as wanrings and warnings are treated
as errors
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: git/zypp/ExternalProgram.cc
===================================================================
--- git.orig/zypp/ExternalProgram.cc 2012-06-01 16:25:17.098304709 -0700
+++ git/zypp/ExternalProgram.cc 2012-06-01 16:25:37.254305681 -0700
@@ -22,6 +22,7 @@
#include <cstring> // strsignal
#include <iostream>
#include <sstream>
+#include <cstdio>
#include "zypp/base/Logger.h"
#include "zypp/base/String.h"
Index: git/zypp/PluginScript.cc
===================================================================
--- git.orig/zypp/PluginScript.cc 2012-06-01 16:21:37.814294089 -0700
+++ git/zypp/PluginScript.cc 2012-06-01 16:24:41.002302961 -0700
@@ -14,6 +14,7 @@
#include <iostream>
#include <sstream>
+#include <cstdio>
#include "zypp/base/LogTools.h"
#include "zypp/base/DefaultIntegral.h"
@@ -336,7 +337,7 @@
if ( fd == -1 )
ZYPP_THROW( PluginScriptException( "Bad file descriptor" ) );
- ::clearerr( filep );
+ std::clearerr( filep );
std::string data;
{
PluginDebugBuffer _debug( data ); // dump receive buffer if PLUGIN_DEBUG
@@ -370,7 +371,7 @@
int retval = select( fd+1, &rfds, NULL, NULL, &tv );
if ( retval > 0 ) // FD_ISSET( fd, &rfds ) will be true.
{
- ::clearerr( filep );
+ std::clearerr( filep );
}
else if ( retval == 0 )
{
meta/recipes-extended/libzypp/libzypp_git.bb
+8 -2
View File
@@ -11,7 +11,7 @@ DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev libproxy"
S = "${WORKDIR}/git"
SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
PV = "0.0-git${SRCPV}"
PR = "r22"
PR = "r23"
SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
file://no-doc.patch \
@@ -24,6 +24,7 @@ SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
file://hardcode-lib-fix.patch \
file://close.patch \
file://libzypp-rpm549.patch \
file://cstdio.patch \
"
SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
@@ -32,7 +33,10 @@ SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch"
# rpmdb2solv from sat-solver is run from libzypp
RDEPENDS_${PN} = "sat-solver rpm-libs gzip gnupg"
RDEPENDS_${PN} = "sat-solver rpm-libs gzip ${RDEPGNUPG}"
RDEPGNUPG = "gnupg"
RDEPGNUPG_libc-uclibc = ""
PACKAGES =+ "${PN}-pkgmgt"
@@ -47,6 +51,8 @@ FILES_${PN}-pkgmgt = "${bindir}/package-manager \
EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
OECMAKE_CXX_LINK_FLAGS_libc-uclibc += "-pthread"
LDFLAGS += "-lpthread"
PACKAGE_ARCH = "${MACHINE_ARCH}"
AVOID_CONSTRUCTOR = ""