From a95d9e19c5bb60e3889019390b8e7be2f99aa6ea Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Sun, 26 Jan 2014 22:38:59 +0100 Subject: [PATCH] libenca: new package Extremely Naive Charset Analyser. This package was originally found at : https://github.com/huceke/buildroot-rbp By gimli [Peter: drop libiconv dep, tools patch, simplify host tools build] Signed-off-by: Maxime Hadjinlian Cc: gimli Cc: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/libenca/Config.in | 6 +++ .../libenca-001-fix-installation-error.patch | 44 +++++++++++++++++++ ...-002-remove-prefix-hack-in-configure.patch | 33 ++++++++++++++ package/libenca/libenca-003-iconv.patch | 15 +++++++ package/libenca/libenca.mk | 26 +++++++++++ 6 files changed, 125 insertions(+) create mode 100644 package/libenca/Config.in create mode 100644 package/libenca/libenca-001-fix-installation-error.patch create mode 100644 package/libenca/libenca-002-remove-prefix-hack-in-configure.patch create mode 100644 package/libenca/libenca-003-iconv.patch create mode 100644 package/libenca/libenca.mk diff --git a/package/Config.in b/package/Config.in index 397cc11d1b..677f01e27a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -773,6 +773,7 @@ menu "Text and terminal handling" source "package/enchant/Config.in" source "package/icu/Config.in" source "package/libedit/Config.in" +source "package/libenca/Config.in" source "package/libfribidi/Config.in" source "package/libiconv/Config.in" source "package/linenoise/Config.in" diff --git a/package/libenca/Config.in b/package/libenca/Config.in new file mode 100644 index 0000000000..5e951ed835 --- /dev/null +++ b/package/libenca/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBENCA + bool "libenca" + help + Extremely Naive Charset Analyser + + http://cihar.com/software/enca/ diff --git a/package/libenca/libenca-001-fix-installation-error.patch b/package/libenca/libenca-001-fix-installation-error.patch new file mode 100644 index 0000000000..fc27841e41 --- /dev/null +++ b/package/libenca/libenca-001-fix-installation-error.patch @@ -0,0 +1,44 @@ +From 1ca09a1a8f3dd07e2805855a1f1a67a54e8d8adb Mon Sep 17 00:00:00 2001 +From: Maxime Hadjinlian +Date: Wed, 15 Jan 2014 00:20:08 +0100 +Subject: [PATCH 2/3] Fix installation error + +ln will complain that the link already exists and will error. +Adding the -f flag, force ln to recreate the link without failing the +build. + +Signed-off-by: Maxime Hadjinlian +--- + Makefile.am | 2 +- + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index b5b50be..ddf1d5f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -54,7 +54,7 @@ install-data-hook: + cd $(DESTDIR)$(man1dir); \ + inst1=`echo enca | sed '$(transform)'`.1; \ + inst2=`echo enconv | sed '$(transform)'`.1; \ +- $(LN_S) $$inst1 $$inst2 ++ $(LN_S) -f $$inst1 $$inst2 + + uninstall-hook: + inst=`echo enconv | sed '$(transform)'`.1; \ +diff --git a/src/Makefile.am b/src/Makefile.am +index 2f01a12..3885137 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -47,7 +47,7 @@ install-exec-hook: + cd $(DESTDIR)$(bindir); \ + inst1=`echo enca | sed '$(transform)'`; \ + inst2=`echo enconv | sed '$(transform)'`; \ +- $(LN_S) $$inst1$(EXEEXT) $$inst2$(EXEEXT) ++ $(LN_S) -f $$inst1$(EXEEXT) $$inst2$(EXEEXT) + + uninstall-hook: + inst=`echo enconv | sed '$(transform)'`; \ +-- +1.8.5.2 + diff --git a/package/libenca/libenca-002-remove-prefix-hack-in-configure.patch b/package/libenca/libenca-002-remove-prefix-hack-in-configure.patch new file mode 100644 index 0000000000..45701f92b4 --- /dev/null +++ b/package/libenca/libenca-002-remove-prefix-hack-in-configure.patch @@ -0,0 +1,33 @@ +From 354a8217eb735c9678f42436d647571fcebc3ead Mon Sep 17 00:00:00 2001 +From: Maxime Hadjinlian +Date: Wed, 15 Jan 2014 00:46:10 +0100 +Subject: [PATCH 3/3] Remove prefix hack in configure + +Signed-off-by: Maxime Hadjinlian +--- + configure.ac | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9db3b21..9b99df4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,15 +100,6 @@ gtk_CHECK_GTK_DOC + dnl Check for good random number sources + AC_CHECK_FILES(/dev/random /dev/urandom /dev/srandom /dev/arandom) + +-dnl Dirty path hack. Helps some people with badly set up search paths. +-if test "$prefix" = "NONE"; then +- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" +- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" +-else +- LDFLAGS="$LDFLAGS -L$prefix/lib" +- CPPFLAGS="$CPPFLAGS -I$prefix/include" +-fi +- + dnl Checks for libraries. + ye_CHECK_LIBM + +-- +1.8.5.2 + diff --git a/package/libenca/libenca-003-iconv.patch b/package/libenca/libenca-003-iconv.patch new file mode 100644 index 0000000000..2ea43c046e --- /dev/null +++ b/package/libenca/libenca-003-iconv.patch @@ -0,0 +1,15 @@ +libiconv.m4: Fix AM_ICONV macro usage + +Signed-off-by: Bernd Kuhls + +--- a/m4/libiconv.m4 2013-09-30 09:48:22.000000000 +0200 ++++ b/m4/libiconv.m4 2014-01-18 12:56:32.634514555 +0100 +@@ -17,7 +17,7 @@ + dnl + + dnl Use standard iconv test +-AM_ICONV ++m4_pattern_allow([AM_ICONV]) + CONVERTER_LIBS="$CONVERTER_LIBS $LIBICONV" + + dnl Compile iconvcap.c and run it to determine what encodings iconv actually diff --git a/package/libenca/libenca.mk b/package/libenca/libenca.mk new file mode 100644 index 0000000000..d998c669d5 --- /dev/null +++ b/package/libenca/libenca.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# libenca +# +################################################################################ + +LIBENCA_VERSION = 1.15 +LIBENCA_SITE = $(call github,nijel,enca,$(LIBENCA_VERSION)) +LIBENCA_INSTALL_STAGING = YES +LIBENCA_AUTORECONF = YES +LIBENCA_LICENSE = GPLv2 +LIBENCA_LICENSE_FILES = COPYING +LIBENCA_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) + +LIBENCA_CONF_ENV += ac_cv_file__dev_random=yes \ + ac_cv_file__dev_urandom=yes \ + ac_cv_file__dev_arandom=no \ + ac_cv_file__dev_srandom=no + +define LIBENCA_MAKE_HOST_TOOL + $(MAKE) -C $(@D)/tools $(HOST_CONFIGURE_OPTS) make_hash +endef + +LIBENCA_POST_CONFIGURE_HOOKS += LIBENCA_MAKE_HOST_TOOL + +$(eval $(autotools-package)) -- 2.30.2