diff options
| -rw-r--r-- | meta/recipes-extended/libzypp/libzypp/close.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/close.patch b/meta/recipes-extended/libzypp/libzypp/close.patch new file mode 100644 index 0000000000..0ff1825410 --- /dev/null +++ b/meta/recipes-extended/libzypp/libzypp/close.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | close() is used without a protype therefore we include unistd.h | ||
| 2 | Fixes compile errors like below | ||
| 3 | |||
| 4 | /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 | ||
| 5 | |||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | Index: git/zypp/ExternalProgram.h | ||
| 10 | =================================================================== | ||
| 11 | --- git.orig/zypp/ExternalProgram.h 2012-03-23 08:27:31.716438539 -0700 | ||
| 12 | +++ git/zypp/ExternalProgram.h 2012-03-23 08:27:54.520439367 -0700 | ||
| 13 | @@ -16,6 +16,7 @@ | ||
| 14 | #include <map> | ||
| 15 | #include <string> | ||
| 16 | #include <vector> | ||
| 17 | +#include <unistd.h> | ||
| 18 | |||
| 19 | #include "zypp/base/ExternalDataSource.h" | ||
| 20 | #include "zypp/Pathname.h" | ||
| 21 | Index: git/zypp/base/Random.cc | ||
| 22 | =================================================================== | ||
| 23 | --- git.orig/zypp/base/Random.cc 2012-03-23 08:31:09.732449118 -0700 | ||
| 24 | +++ git/zypp/base/Random.cc 2012-03-23 08:31:36.240450324 -0700 | ||
| 25 | @@ -3,6 +3,7 @@ | ||
| 26 | #include <cstdio> | ||
| 27 | #include <iostream> | ||
| 28 | #include <fcntl.h> | ||
| 29 | +#include <unistd.h> | ||
| 30 | #include "zypp/base/Random.h" | ||
| 31 | |||
| 32 | using namespace std; | ||
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index 368cc06986..78c7a6a057 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" | |||
| 11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
| 12 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" | 12 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" |
| 13 | PV = "0.0-git${SRCPV}" | 13 | PV = "0.0-git${SRCPV}" |
| 14 | PR = "r18" | 14 | PR = "r19" |
| 15 | 15 | ||
| 16 | SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ | 16 | SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ |
| 17 | file://no-doc.patch \ | 17 | file://no-doc.patch \ |
| @@ -22,6 +22,7 @@ SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ | |||
| 22 | file://libzypp-compatargs.patch \ | 22 | file://libzypp-compatargs.patch \ |
| 23 | file://fix_for_compile_wth_gcc-4.6.0.patch \ | 23 | file://fix_for_compile_wth_gcc-4.6.0.patch \ |
| 24 | file://hardcode-lib-fix.patch \ | 24 | file://hardcode-lib-fix.patch \ |
| 25 | file://close.patch \ | ||
| 25 | " | 26 | " |
| 26 | 27 | ||
| 27 | SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" | 28 | SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" |
