From 0d51d807aaa1316e6513a9a3711f642d8716fc3b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 18 Nov 2009 00:38:44 +0000 Subject: xerces-c: Patch out local linking directories Signed-off-by: Richard Purdie --- .../packages/xerces-c/xerces-c/nolocallink.patch | 34 ++++++++++++++++++++++ meta-moblin/packages/xerces-c/xerces-c_2.8.0.bb | 5 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 meta-moblin/packages/xerces-c/xerces-c/nolocallink.patch 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 @@ +Index: xercesc/Makefile.incl +=================================================================== +--- xercesc.orig/Makefile.incl 2009-11-18 00:31:14.000000000 +0000 ++++ xercesc/Makefile.incl 2009-11-18 00:31:58.000000000 +0000 +@@ -519,23 +519,23 @@ + + ifeq (${BITSTOBUILD}, 64) + ifeq (${TRANSCODER}, ICU) +- ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata ++ ALLLIBS = ${LIBS} -licuuc -licudata + else +- ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib ++ ALLLIBS = ${LIBS} + endif + + ifeq (${MESSAGELOADER}, ICU) +- ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lXercesMessages ++ ALLLIBS = ${LIBS} -licuuc -licudata -lXercesMessages + endif + else + ifeq (${TRANSCODER}, ICU) +- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata ++ ALLLIBS = ${LIBS} -licuuc -licudata + else +- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib ++ ALLLIBS = ${LIBS} + endif + + ifeq (${MESSAGELOADER}, ICU) +- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lXercesMessages ++ ALLLIBS = ${LIBS} -licuuc -licudata -lXercesMessages + endif + endif + 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/" SECTION = "libs" PRIORITY = "optional" LICENSE = "MIT" -PR = "r1" +PR = "r2" -SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/2/sources/xerces-c-src_2_8_0.tar.gz" +SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/2/sources/xerces-c-src_2_8_0.tar.gz \ + file://nolocallink.patch;patch=1" S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc" inherit autotools pkgconfig -- cgit 1.2.3-korg