summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2012-04-22 21:07:10 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2012-04-22 21:07:10 +0000
commit491956353236f738f561609f78d1e4d61a960369 (patch)
treeeb6cca27b7da53376190480e063e24c7372b6deb /dev-libs/yaz/files
parentMask new slot of yaz. (diff)
downloadgentoo-2-491956353236f738f561609f78d1e4d61a960369.tar.gz
gentoo-2-491956353236f738f561609f78d1e4d61a960369.tar.bz2
gentoo-2-491956353236f738f561609f78d1e4d61a960369.zip
Version bumps. v4 is pmasked for slotting.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/yaz/files')
-rw-r--r--dev-libs/yaz/files/yaz-4.2.30-icu-automagic.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/dev-libs/yaz/files/yaz-4.2.30-icu-automagic.patch b/dev-libs/yaz/files/yaz-4.2.30-icu-automagic.patch
new file mode 100644
index 000000000000..e6854448b513
--- /dev/null
+++ b/dev-libs/yaz/files/yaz-4.2.30-icu-automagic.patch
@@ -0,0 +1,25 @@
+diff -Nuar yaz-4.2.30.orig/configure.ac yaz-4.2.30/configure.ac
+--- yaz-4.2.30.orig/configure.ac 2012-03-23 10:20:20.000000000 +0000
++++ yaz-4.2.30/configure.ac 2012-04-22 20:56:41.118691087 +0000
+@@ -372,14 +372,13 @@
+
+ dnl
+ dnl
+-AC_CHECK_ICU([3.4],[
+- if test "$xml_enabled" = "true"; then
+- ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
+- else
+- ICU_CPPFLAGS=""
+- AC_MSG_WARN([ICU support disabled because XML support is unavailable])
+- fi
+-])
++AC_ARG_ENABLE(icu, [ --enable-icu enable ICU support],[enable_icu=$enableval],[enable_icu=no])
++if test "$enable_icu" = "yes"; then
++ AC_CHECK_ICU([3.4],[
++ ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"],[
++ AC_MSG_ERROR([For ICU support please install libicu34-dev or similar])
++ ])
++fi
+ dnl ------ versioning
+ dnl
+ WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'`