summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/ulxmlrpcpp/files/remove-local-includes.patch13
-rw-r--r--packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb (renamed from packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb)13
2 files changed, 19 insertions, 7 deletions
diff --git a/packages/ulxmlrpcpp/files/remove-local-includes.patch b/packages/ulxmlrpcpp/files/remove-local-includes.patch
new file mode 100644
index 0000000000..13083c24aa
--- /dev/null
+++ b/packages/ulxmlrpcpp/files/remove-local-includes.patch
@@ -0,0 +1,13 @@
+Index: ulxmlrpcpp-1.7.3/configure.in
+===================================================================
+--- ulxmlrpcpp-1.7.3.orig/configure.in
++++ ulxmlrpcpp-1.7.3/configure.in
+@@ -326,8 +326,6 @@ else
+ echo "*** ssl (OpenSSL) found."
+ echo "********************************************************"
+ AC_DEFINE(ULXR_INCLUDE_SSL_STUFF, 1, [Define to compile with ssl support.])
+- dnl should fix RedHat problem
+- EA_EXTRA_INC="$EA_EXTRA_INC -I/usr/include/kerberos/"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[unsigned x = SSL_ERROR_WANT_ACCEPT; ]])],[AC_DEFINE(ULXR_HAVE_SSL_ERROR_WANT_ACCEPT, 1, Define if your ssl has SSL_ERROR_WANT_ACCEPT)
+ ],[])
+ fi
diff --git a/packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb b/packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb
index c08d308c0a..4466e72fae 100644
--- a/packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb
+++ b/packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb
@@ -6,17 +6,16 @@ DEPENDS = "expat"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/ulxmlrpcpp/ulxmlrpcpp-${PV}-src.tar.bz2 \
- file://disable-docs.patch;patch=1"
+ file://disable-docs.patch;patch=1 \
+ file://remove-local-includes.patch;patch=1"
inherit autotools
-do_configure_prepend() {
- install -d config
- touch config/lib-prefix.m4 config/lib-link.m4 config/lib-ld.m4
+do_configure_append() {
+ echo "#define ulxr_snprintf snprintf" >>ulxmlrpcpp/ulxmlrpcpp.h
}
LEAD_SONAME = "libulxmlrpcpp.so"
PACKAGES =+ "${PN}-examples ${PN}-contrib"
-FILES_${PN}-examples = "${bindir}"
-FILES_${PN}-contrib = "${libdir}/*contrib*"
-
+FILES_${PN}-examples = "${bindir}/*"
+FILES_${PN}-contrib = "${libdir}/*contrib.so.*"