From cb5660d3a28e9d8e0b67866781f78f250c371994 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 19 May 2006 20:31:50 +0000 Subject: 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... --- packages/libcroco/files/.mtn2git_empty | 0 packages/libcroco/files/croco.patch | 13 +++++++++++++ packages/libcroco/libcroco_0.6.0.bb | 2 ++ packages/libcroco/libcroco_0.6.1.bb | 2 ++ 4 files changed, 17 insertions(+) create mode 100644 packages/libcroco/files/.mtn2git_empty create mode 100644 packages/libcroco/files/croco.patch (limited to 'packages/libcroco') diff --git a/packages/libcroco/files/.mtn2git_empty b/packages/libcroco/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 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 -- cgit v1.2.3