From 961589f1a43f938d30b4f8f2ce79c9710edaf58b Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 31 Oct 2008 15:20:31 +0000 Subject: libxml2: Fix a compilation error when using -D_FORTIFY_SOURCE=2 thanks Chenglan Huang --- meta/packages/libxml/files/libxml-nanohttp.patch | 13 +++++++++++++ meta/packages/libxml/libxml2-native_2.6.29.bb | 2 +- meta/packages/libxml/libxml2.inc | 3 ++- meta/packages/libxml/libxml2_2.6.29.bb | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 meta/packages/libxml/files/libxml-nanohttp.patch (limited to 'meta') diff --git a/meta/packages/libxml/files/libxml-nanohttp.patch b/meta/packages/libxml/files/libxml-nanohttp.patch new file mode 100644 index 0000000000..550e036db3 --- /dev/null +++ b/meta/packages/libxml/files/libxml-nanohttp.patch @@ -0,0 +1,13 @@ +Index: libxml2-2.6.29/nanohttp.c +=================================================================== +--- libxml2-2.6.29.orig/nanohttp.c 2008-10-30 10:12:11.000000000 +0800 ++++ libxml2-2.6.29/nanohttp.c 2008-10-30 10:12:30.000000000 +0800 +@@ -1585,7 +1585,7 @@ + if (!strcmp(filename, "-")) + fd = 0; + else { +- fd = open(filename, O_CREAT | O_WRONLY); ++ fd = open(filename, O_CREAT | O_WRONLY, 0644); + if (fd < 0) { + xmlNanoHTTPClose(ctxt); + return(-1); diff --git a/meta/packages/libxml/libxml2-native_2.6.29.bb b/meta/packages/libxml/libxml2-native_2.6.29.bb index 4f7a801495..730e1cb3bb 100644 --- a/meta/packages/libxml/libxml2-native_2.6.29.bb +++ b/meta/packages/libxml/libxml2-native_2.6.29.bb @@ -1,6 +1,6 @@ require libxml2.inc -PR = "r4" +PR = "r8" DEPENDS += "python-native-runtime" diff --git a/meta/packages/libxml/libxml2.inc b/meta/packages/libxml/libxml2.inc index 4e6e527603..6b526b7fdb 100644 --- a/meta/packages/libxml/libxml2.inc +++ b/meta/packages/libxml/libxml2.inc @@ -4,7 +4,8 @@ PRIORITY = "optional" LICENSE = "MIT" SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \ - file://libxml-64bit.patch;patch=1" + file://libxml-64bit.patch;patch=1 \ + file://libxml-nanohttp.patch;patch=1" inherit autotools pkgconfig binconfig diff --git a/meta/packages/libxml/libxml2_2.6.29.bb b/meta/packages/libxml/libxml2_2.6.29.bb index 3b4bac673a..2f583c2c30 100644 --- a/meta/packages/libxml/libxml2_2.6.29.bb +++ b/meta/packages/libxml/libxml2_2.6.29.bb @@ -1,6 +1,6 @@ require libxml2.inc -PR = "r6" +PR = "r7" export LDFLAGS += "-ldl" -- cgit v1.2.3-54-g00ecf