diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-10-30 16:24:39 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-10-30 16:24:39 +0000 |
| commit | f6b1acbad2e08755a741cefcabaf760d5bfede8e (patch) | |
| tree | d3e578f798cd3b2fcaf4bb29b47e819e05ccf197 /patches/elektra-0.7.0-r1618 | |
| parent | f8b7ef9472cf3e84d2df1397461112cdd5963460 (diff) | |
| download | ptxdist-f6b1acbad2e08755a741cefcabaf760d5bfede8e.tar.gz ptxdist-f6b1acbad2e08755a741cefcabaf760d5bfede8e.tar.xz | |
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9002 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/elektra-0.7.0-r1618')
| -rw-r--r-- | patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-libxml2.diff | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-libxml2.diff b/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-libxml2.diff index 746b2584f..b5b3c615b 100644 --- a/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-libxml2.diff +++ b/patches/elektra-0.7.0-r1618/generic/elektra-0.7.0rc5-libxml2.diff @@ -1,12 +1,20 @@ +Subject: [PATCH] use pkg-config for libxml2 detection +From: Robert Schwebel <r.schwebel@pengutronix.de> + +When cross compiling, the current test incorrectly picks up the libxml2 +from the development host. Use pkg-config in order to do it right. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + --- - configure.ac | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) + configure.ac | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) Index: elektra-0.7.0-r1618/configure.ac =================================================================== --- elektra-0.7.0-r1618.orig/configure.ac +++ elektra-0.7.0-r1618/configure.ac -@@ -435,14 +435,22 @@ fi +@@ -435,11 +435,19 @@ fi privatelibs="" # Check for libxml (Allow compilation of libelektratools) @@ -23,14 +31,10 @@ Index: elektra-0.7.0-r1618/configure.ac +AC_SUBST(libxml2_CFLAGS) +AC_SUBST(libxml2_LIBS) +AM_CONDITIONAL([HAVE_XML],[test "$HAVE_XML" = "yes"]) -+ +if test $HAVE_XML; then elektratools=libelektratools - privatelibs=$privatelibs" -lxml2" + privatelibs=$privatelibs"$libxml2_LIBS" fi --AC_SUBST(elektratools) - - - + AC_SUBST(elektratools) |