summaryrefslogtreecommitdiffstats
path: root/meta-moblin
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-18 00:38:44 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-18 00:38:44 +0000
commit0d51d807aaa1316e6513a9a3711f642d8716fc3b (patch)
treee836d9ece231b446e4abba7350886718468483d1 /meta-moblin
parentbc111fc45c863b7cd9f9d43094ae7a0d0034d6d8 (diff)
downloadpoky-0d51d807aaa1316e6513a9a3711f642d8716fc3b.tar.gz
xerces-c: Patch out local linking directories
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin')
-rw-r--r--meta-moblin/packages/xerces-c/xerces-c/nolocallink.patch34
-rw-r--r--meta-moblin/packages/xerces-c/xerces-c_2.8.0.bb5
2 files changed, 37 insertions, 2 deletions
diff --git a/meta-moblin/packages/xerces-c/xerces-c/nolocallink.patch b/meta-moblin/packages/xerces-c/xerces-c/nolocallink.patch
new file mode 100644
index 0000000000..d1fa2de9c1
--- /dev/null
+++ b/meta-moblin/packages/xerces-c/xerces-c/nolocallink.patch
@@ -0,0 +1,34 @@
1Index: xercesc/Makefile.incl
2===================================================================
3--- xercesc.orig/Makefile.incl 2009-11-18 00:31:14.000000000 +0000
4+++ xercesc/Makefile.incl 2009-11-18 00:31:58.000000000 +0000
5@@ -519,23 +519,23 @@
6
7 ifeq (${BITSTOBUILD}, 64)
8 ifeq (${TRANSCODER}, ICU)
9- ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata
10+ ALLLIBS = ${LIBS} -licuuc -licudata
11 else
12- ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
13+ ALLLIBS = ${LIBS}
14 endif
15
16 ifeq (${MESSAGELOADER}, ICU)
17- ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lXercesMessages
18+ ALLLIBS = ${LIBS} -licuuc -licudata -lXercesMessages
19 endif
20 else
21 ifeq (${TRANSCODER}, ICU)
22- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata
23+ ALLLIBS = ${LIBS} -licuuc -licudata
24 else
25- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
26+ ALLLIBS = ${LIBS}
27 endif
28
29 ifeq (${MESSAGELOADER}, ICU)
30- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lXercesMessages
31+ ALLLIBS = ${LIBS} -licuuc -licudata -lXercesMessages
32 endif
33 endif
34
diff --git a/meta-moblin/packages/xerces-c/xerces-c_2.8.0.bb b/meta-moblin/packages/xerces-c/xerces-c_2.8.0.bb
index 8fb85fa59c..23f5885628 100644
--- a/meta-moblin/packages/xerces-c/xerces-c_2.8.0.bb
+++ b/meta-moblin/packages/xerces-c/xerces-c_2.8.0.bb
@@ -3,9 +3,10 @@ HOMEPAGE = "http://xerces.apache.org/xerces-c/"
3SECTION = "libs" 3SECTION = "libs"
4PRIORITY = "optional" 4PRIORITY = "optional"
5LICENSE = "MIT" 5LICENSE = "MIT"
6PR = "r1" 6PR = "r2"
7 7
8SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/2/sources/xerces-c-src_2_8_0.tar.gz" 8SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/2/sources/xerces-c-src_2_8_0.tar.gz \
9 file://nolocallink.patch;patch=1"
9S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc" 10S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc"
10 11
11inherit autotools pkgconfig 12inherit autotools pkgconfig