diff options
author | Joshua Lock <josh@linux.intel.com> | 2008-10-31 15:20:31 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <marcin@buglabs.net> | 2009-07-28 09:30:10 +0200 |
commit | 961589f1a43f938d30b4f8f2ce79c9710edaf58b (patch) | |
tree | 4dd8022dad0c40c1cbdc6dbe4b13ca205d9b9c86 | |
parent | 99e4fde8fc6d720a591c90a0925ca8e38bad059b (diff) | |
download | poky-961589f1a43f938d30b4f8f2ce79c9710edaf58b.tar.gz |
libxml2: Fix a compilation error when using -D_FORTIFY_SOURCE=2 thanks Chenglan Huang
-rw-r--r-- | meta/packages/libxml/files/libxml-nanohttp.patch | 13 | ||||
-rw-r--r-- | meta/packages/libxml/libxml2-native_2.6.29.bb | 2 | ||||
-rw-r--r-- | meta/packages/libxml/libxml2.inc | 3 | ||||
-rw-r--r-- | meta/packages/libxml/libxml2_2.6.29.bb | 2 |
4 files changed, 17 insertions, 3 deletions
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 @@ | |||
1 | Index: libxml2-2.6.29/nanohttp.c | ||
2 | =================================================================== | ||
3 | --- libxml2-2.6.29.orig/nanohttp.c 2008-10-30 10:12:11.000000000 +0800 | ||
4 | +++ libxml2-2.6.29/nanohttp.c 2008-10-30 10:12:30.000000000 +0800 | ||
5 | @@ -1585,7 +1585,7 @@ | ||
6 | if (!strcmp(filename, "-")) | ||
7 | fd = 0; | ||
8 | else { | ||
9 | - fd = open(filename, O_CREAT | O_WRONLY); | ||
10 | + fd = open(filename, O_CREAT | O_WRONLY, 0644); | ||
11 | if (fd < 0) { | ||
12 | xmlNanoHTTPClose(ctxt); | ||
13 | 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 @@ | |||
1 | require libxml2.inc | 1 | require libxml2.inc |
2 | 2 | ||
3 | PR = "r4" | 3 | PR = "r8" |
4 | 4 | ||
5 | DEPENDS += "python-native-runtime" | 5 | DEPENDS += "python-native-runtime" |
6 | 6 | ||
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" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | 5 | ||
6 | SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \ | 6 | SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \ |
7 | file://libxml-64bit.patch;patch=1" | 7 | file://libxml-64bit.patch;patch=1 \ |
8 | file://libxml-nanohttp.patch;patch=1" | ||
8 | 9 | ||
9 | inherit autotools pkgconfig binconfig | 10 | inherit autotools pkgconfig binconfig |
10 | 11 | ||
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 @@ | |||
1 | require libxml2.inc | 1 | require libxml2.inc |
2 | 2 | ||
3 | PR = "r6" | 3 | PR = "r7" |
4 | 4 | ||
5 | export LDFLAGS += "-ldl" | 5 | export LDFLAGS += "-ldl" |
6 | 6 | ||