summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2006-05-19 20:31:50 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-19 20:31:50 +0000
commitcb5660d3a28e9d8e0b67866781f78f250c371994 (patch)
treef3a671bea39cd07e8f9dcbffd36a6816525db419
parent25f4dd6a42293e3e7c2644d53d22d3a049975dc6 (diff)
packages/libcroco: Fix generation of libcroco*.pc to not include /usr/include
Change autofoo to not put /usr/include into the CFlags, same applies to the library flags. GNU master phil crafted this patch - which I'm not able to understand...
-rw-r--r--packages/libcroco/files/.mtn2git_empty0
-rw-r--r--packages/libcroco/files/croco.patch13
-rw-r--r--packages/libcroco/libcroco_0.6.0.bb2
-rw-r--r--packages/libcroco/libcroco_0.6.1.bb2
4 files changed, 17 insertions, 0 deletions
diff --git a/packages/libcroco/files/.mtn2git_empty b/packages/libcroco/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libcroco/files/.mtn2git_empty
diff --git a/packages/libcroco/files/croco.patch b/packages/libcroco/files/croco.patch
new file mode 100644
index 0000000000..572f9de59f
--- /dev/null
+++ b/packages/libcroco/files/croco.patch
@@ -0,0 +1,13 @@
+--- opie/configure.in.old 2006-05-19 20:57:30.000000000 +0100
++++ opie/configure.in 2006-05-19 20:57:56.000000000 +0100
+@@ -131,8 +131,8 @@
+ dnl Define the CROCO_LIBS and CROCO_CFLAGS variables. These will be used
+ dnl by client application to know where to find croco include files and libs.
+ dnl
+-CROCO_LIBS="-L${libdir} -lcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
+-CROCO_CFLAGS="-I${includedir}/libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
++CROCO_LIBS='-L${libdir}'" -lcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
++CROCO_CFLAGS='-I${includedir}'"/libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
+
+ AC_SUBST(LIBXML2_LIBS)
+ AC_SUBST(LIBXML2_CFLAGS)
diff --git a/packages/libcroco/libcroco_0.6.0.bb b/packages/libcroco/libcroco_0.6.0.bb
index bbed9e4fb3..ead05af413 100644
--- a/packages/libcroco/libcroco_0.6.0.bb
+++ b/packages/libcroco/libcroco_0.6.0.bb
@@ -7,6 +7,8 @@ PR = "r1"
inherit autotools pkgconfig gnome
+SRC_URI_append = " file://croco.patch;patch=1 "
+
do_stage() {
install -d ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/libcroco
diff --git a/packages/libcroco/libcroco_0.6.1.bb b/packages/libcroco/libcroco_0.6.1.bb
index d92987adf3..99bd631913 100644
--- a/packages/libcroco/libcroco_0.6.1.bb
+++ b/packages/libcroco/libcroco_0.6.1.bb
@@ -7,6 +7,8 @@ PR = "r1"
inherit autotools pkgconfig gnome
+SRC_URI_append = " file://croco.patch;patch=1 "
+
do_stage() {
install -d ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/libcroco