From a29e0baf2063375b3474a362f8ec13030db28cbd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 2 Oct 2011 20:24:00 +0200 Subject: [PATCH] fribidi: build with charset support, rework configure options Signed-off-by: Stephan Raue --- packages/other/fribidi/build | 9 +++++--- .../patches/fribidi-0.19.2-chunk_size.patch | 22 ------------------- 2 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch diff --git a/packages/other/fribidi/build b/packages/other/fribidi/build index c7f6b7a915..a87845fd48 100755 --- a/packages/other/fribidi/build +++ b/packages/other/fribidi/build @@ -26,11 +26,14 @@ cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ - --disable-debug \ - --enable-malloc \ - --with-glib=no \ --enable-shared \ --disable-static \ + --disable-debug \ + --disable-deprecated \ + --disable-malloc \ + --enable-charsets \ + --with-gnu-ld \ + --without-glib make diff --git a/packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch b/packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch deleted file mode 100644 index e7256dabf5..0000000000 --- a/packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch +++ /dev/null @@ -1,22 +0,0 @@ -Define FRIBIDI_CHUNK_SIZE only if using allocation pools - -diff -Nur fribidi2-cvs-20061020.orig/lib/common.h fribidi2-cvs-20061020/lib/common.h ---- fribidi2-cvs-20061020.orig/lib/common.h Tue Jan 31 05:23:12 2006 -+++ fribidi2-cvs-20061020/lib/common.h Sat Oct 21 16:42:41 2006 -@@ -131,6 +131,8 @@ - - /* FRIBIDI_CHUNK_SIZE is the number of bytes in each chunk of memory being - * allocated for data structure pools. */ -+#if USE_SIMPLE_MALLOC+0 -+#else - #ifndef FRIBIDI_CHUNK_SIZE - # if HAVE_ASM_PAGE_H - # ifndef __FRIBIDI_DOC -@@ -145,6 +147,7 @@ - # error FRIBIDI_CHUNK_SIZE now should define the size of a chunk in bytes. - # endif /* FRIBIDI_CHUNK_SIZE < 256 */ - #endif /* FRIBIDI_CHUNK_SIZE */ -+#endif /* USE_SIMPLE_MALLOC */ - - /* FRIBIDI_BEGIN_STMT should be used at the beginning of your macro - * definitions that are to behave like simple statements. Use