mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
wvstreams: add recipe for version 4.6.1
Recipe based on OE classic's recipe for version 4.4.1, as of 0585ccfa49f71a81652c7f63885202e952ebd0e9. Summary of changes against OE classic's recipe: * Apply some Debian patches from http://patch-tracker.debian.org/package/wvstreams/4.6.1-6 * Minor adjustments for the current build system (add LIC_FILES_CHKSUM, md5 and sha256 sums for SRC_URI, fix LICENSE, remove PR) * Add --without-valgrind to EXTRA_OECONF * Disable parallel make, since it was causing errors like Log data follows: | DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common', 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi', 'common'] | DEBUG: Executing shell function do_compile | NOTE: make -j 8 | ./CXX -c utils/wvbuffer | ./CXX -c utils/wvbufferstore | ./CXX -c utils/wvcont | /bin/bash: ./CXX: No such file or directory | /bin/bash: ./CXX: No such file or directory | /bin/bash: ./CXX: No such file or directory | * Generating CC using c | make: * Generating CXX using cc | *** [utils/wvbuffer.o] Error 127 | make: *** Waiting for unfinished jobs.... | make: *** [utils/wvbufferstore.o] Error 127 | make: *** [utils/wvcont.o] Error 127 | ERROR: oe_runmake failed | WARNING: .../tmp/work/armv7a-vfp-neon-oel-linux-gnueabi/wvstreams/4.6.1-r0/temp/run.do_compile.19302:1 exit 1 from | exit 1 | ERROR: Function failed: do_compile (log file is located at .../tmp/work/armv7a-vfp-neon-oel-linux-gnueabi/wvstreams/4.6.1-r0/temp/log.do_compile.19302) Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Mario Domenech Goulart
committed by
Martin Jansa
Martin Jansa
parent
73a68490ef
commit
9158102744
@@ -0,0 +1,13 @@
|
||||
Index: wvstreams-4.6/crypto/wvx509.cc
|
||||
===================================================================
|
||||
--- wvstreams-4.6.orig/crypto/wvx509.cc 2009-07-29 11:58:16.000000000 -0400
|
||||
+++ wvstreams-4.6/crypto/wvx509.cc 2009-07-29 11:58:43.000000000 -0400
|
||||
@@ -325,7 +325,7 @@
|
||||
}
|
||||
|
||||
int verify_result = X509_REQ_verify(certreq, pk);
|
||||
- if (verify_result == 0)
|
||||
+ if (verify_result == 0 || verify_result == -1)
|
||||
{
|
||||
debug(WvLog::Warning, "Self signed request failed");
|
||||
X509_REQ_free(certreq);
|
||||
@@ -0,0 +1,41 @@
|
||||
Index: wvstreams-4.6.1/crypto/wvx509.cc
|
||||
===================================================================
|
||||
--- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584 +0200
|
||||
+++ wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200
|
||||
@@ -1157,7 +1157,7 @@
|
||||
|
||||
if (ext)
|
||||
{
|
||||
- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
|
||||
+ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext);
|
||||
if (!method)
|
||||
{
|
||||
WvDynBuf buf;
|
||||
Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc
|
||||
===================================================================
|
||||
--- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:38.391136584 +0200
|
||||
+++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:35.283136585 +0200
|
||||
@@ -1,8 +1,6 @@
|
||||
#include "wvunixdgsocket.h"
|
||||
-#ifdef MACOS
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
-#endif
|
||||
|
||||
WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms)
|
||||
: socketfile(filename)
|
||||
Index: wvstreams-4.6.1/streams/wvatomicfile.cc
|
||||
===================================================================
|
||||
--- wvstreams-4.6.1.orig/streams/wvatomicfile.cc 2011-05-20 00:02:38.223136584 +0200
|
||||
+++ wvstreams-4.6.1/streams/wvatomicfile.cc 2011-05-20 00:02:31.619136587 +0200
|
||||
@@ -10,10 +10,7 @@
|
||||
#include "wvatomicfile.h"
|
||||
#include "wvfileutils.h"
|
||||
#include "wvstrutils.h"
|
||||
-
|
||||
-#ifdef MACOS
|
||||
#include <sys/stat.h>
|
||||
-#endif
|
||||
|
||||
WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode)
|
||||
: tmp_file(WvString::null)
|
||||
@@ -0,0 +1,18 @@
|
||||
Description: Fix FTBFS with gcc-4.7
|
||||
Small header include change. This is borderlinde cosmetic, but still needed
|
||||
to prevent the FTBFS.
|
||||
Author: Paul Tagliamonte <paultag@ubuntu.com>
|
||||
Origin: vendor
|
||||
Bug-Debian: http://bugs.debian.org/667418
|
||||
Last-Update: 2012-04-13
|
||||
|
||||
--- wvstreams-4.6.1.orig/utils/wvuid.cc
|
||||
+++ wvstreams-4.6.1/utils/wvuid.cc
|
||||
@@ -33,6 +33,7 @@ wvuid_t wvgetuid()
|
||||
|
||||
#else // not WIN32
|
||||
|
||||
+#include <unistd.h>
|
||||
|
||||
WvString wv_username_from_uid(wvuid_t uid)
|
||||
{
|
||||
@@ -0,0 +1,32 @@
|
||||
Index: b/gen-cc
|
||||
===================================================================
|
||||
--- a/gen-cc
|
||||
+++ b/gen-cc
|
||||
@@ -15,6 +15,11 @@
|
||||
shift
|
||||
shift
|
||||
|
||||
+ echo $CC \$MODE -o \$BASE.o \$BASE.$EXT \\
|
||||
+ -MMD -MF \$DEPFILE -MP -MQ \$BASE.o \\
|
||||
+ $CPPFLAGS \\
|
||||
+ $CFLAGS \\
|
||||
+ "\$@"
|
||||
$CC \$MODE -o \$BASE.o \$BASE.$EXT \\
|
||||
-MMD -MF \$DEPFILE -MP -MQ \$BASE.o \\
|
||||
$CPPFLAGS \\
|
||||
Index: b/wvrules-posix.mk
|
||||
===================================================================
|
||||
--- a/wvrules-posix.mk
|
||||
+++ b/wvrules-posix.mk
|
||||
@@ -35,11 +35,6 @@
|
||||
# Default compiler we use for linking
|
||||
WVLINK_CC = $(CXX)
|
||||
|
||||
-ifneq ("$(enable_optimization)", "no")
|
||||
- CXXFLAGS+=-O2
|
||||
- CFLAGS+=-O2
|
||||
-endif
|
||||
-
|
||||
ifneq ("$(enable_warnings)", "no")
|
||||
CXXFLAGS+=-Wall -Woverloaded-virtual
|
||||
CFLAGS+=-Wall
|
||||
@@ -0,0 +1,42 @@
|
||||
HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams"
|
||||
DESCRIPTION = "WvStreams is a network programming library in C++"
|
||||
|
||||
LICENSE = "LGPLv2"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605"
|
||||
|
||||
DEPENDS = "zlib openssl (>= 0.9.8)"
|
||||
|
||||
SRC_URI = "http://${PN}.googlecode.com/files/${PN}-${PV}.tar.gz \
|
||||
file://04_signed_request.diff \
|
||||
file://05_gcc.diff \
|
||||
file://06_gcc-4.7.diff \
|
||||
file://07_buildflags.diff \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
|
||||
SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
|
||||
|
||||
EXTRA_OECONF = " --without-tcl --without-qt --without-pam --without-valgrind"
|
||||
|
||||
PACKAGES_prepend = "libuniconf libuniconf-dbg "
|
||||
PACKAGES_prepend = "uniconfd uniconfd-dbg "
|
||||
PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg "
|
||||
PACKAGES_prepend = "libwvstreams-extras libwvstreams-extras-dbg "
|
||||
|
||||
FILES_libuniconf = "${libdir}/libuniconf.so.*"
|
||||
FILES_libuniconf-dbg = "${libdir}/.debug/libuniconf.so.*"
|
||||
|
||||
FILES_uniconfd = "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf"
|
||||
FILES_uniconfd-dbg = "${sbindir}/.debug/uniconfd"
|
||||
|
||||
FILES_libwvstreams-base = "${libdir}/libwvutils.so.*"
|
||||
FILES_libwvstreams-base-dbg = "${libdir}/.debug/libwvutils.so.*"
|
||||
|
||||
FILES_libwvstreams-extras = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*"
|
||||
FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debug/libwvstreams.so.*"
|
||||
Reference in New Issue
Block a user