diff options
| author |   Aaron W. Swenson <titanofold@gentoo.org> | 2013-02-11 14:11:31 +0000 |
|---|---|---|
| committer | Aaron W. Swenson <titanofold@gentoo.org> | 2013-02-11 14:11:31 +0000 |
| commit | ca60d26d10e17e23d2b8eb84acfe94c876180dd4 (patch) | |
| tree | 56c382afb8f72b39e4d0a2992efe028ec61f577e /dev-db/postgis/files | |
| parent | Updated EULA for TeamSpeak 3.x to revised version of February 2nd, 2010. (diff) | |
| download | gentoo-2-ca60d26d10e17e23d2b8eb84acfe94c876180dd4.tar.gz gentoo-2-ca60d26d10e17e23d2b8eb84acfe94c876180dd4.tar.bz2 gentoo-2-ca60d26d10e17e23d2b8eb84acfe94c876180dd4.zip | |
Patch now defines HAVE_LIBJSON
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)
Diffstat (limited to 'dev-db/postgis/files')
| -rw-r--r-- | dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch b/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch index 06a1c6a5740c..45c5b07654e3 100644 --- a/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch +++ b/dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch @@ -1,7 +1,7 @@ -diff -Naurw postgis-2.0.2.orig/configure.ac postgis-2.0.2/configure.ac +diff -Naruw postgis-2.0.2.orig/configure.ac postgis-2.0.2/configure.ac --- postgis-2.0.2.orig/configure.ac 2012-05-17 12:10:04.000000000 +0000 -+++ postgis-2.0.2/configure.ac 2013-02-03 23:23:31.884847406 +0000 -@@ -701,57 +701,11 @@ ++++ postgis-2.0.2/configure.ac 2013-02-11 11:57:06.733323130 +0000 +@@ -701,57 +701,14 @@ dnl Detect if json-c installed dnl =========================================================================== @@ -34,8 +34,7 @@ diff -Naurw postgis-2.0.2.orig/configure.ac postgis-2.0.2/configure.ac - JSON_LDFLAGS="-L$JSONDIR/lib -ljson" - fi -fi -+PKG_CHECK_MODULES([JSON], [json], [HAVE_JSON=yes], [HAVE_JSON=no]) - +- -dnl Check that we can find the json/json.h header file -CPPFLAGS_SAVE="$CPPFLAGS" -CPPFLAGS="$JSON_CPPFLAGS" @@ -49,21 +48,24 @@ diff -Naurw postgis-2.0.2.orig/configure.ac postgis-2.0.2/configure.ac -LIBS="$LIBS_SAVE" - -if test "$HAVE_JSON" = "yes"; then -- AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present]) ++PKG_CHECK_MODULES([JSON], [json], ++ [ ++ HAVE_JSON=yes + AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present]) - if test "x$JSON_LDFLAGS" = "x"; then - JSON_LDFLAGS="-ljson" - fi -fi -- ++ ], ++ [HAVE_JSON=no]) + -AC_SUBST([JSON_CPPFLAGS]) -AC_SUBST([JSON_LDFLAGS]) +AC_SUBST([HAVE_JSON]) -+AC_SUBST([JSON_CFLAGS]) -+AC_SUBST([JSON_LIBS]) dnl =========================================================================== dnl Detect GTK+2.0 for GUI -@@ -842,10 +796,10 @@ +@@ -842,10 +799,10 @@ AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics]) @@ -76,9 +78,9 @@ diff -Naurw postgis-2.0.2.orig/configure.ac postgis-2.0.2/configure.ac AC_SUBST([SHLIB_LINK]) dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK]) -diff -Naurw postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c postgis-2.0.2/postgis/lwgeom_in_geojson.c +diff -Naruw postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c postgis-2.0.2/postgis/lwgeom_in_geojson.c --- postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c 2012-12-03 16:18:33.000000000 +0000 -+++ postgis-2.0.2/postgis/lwgeom_in_geojson.c 2013-02-04 14:23:34.242564302 +0000 ++++ postgis-2.0.2/postgis/lwgeom_in_geojson.c 2013-02-11 12:09:29.017167709 +0000 @@ -28,8 +28,8 @@ #ifdef HAVE_LIBJSON |