[oe-commits] org.oe.dev enca 1.9: Fix build.

[dp commit]

enca 1.9: Fix build.
* These patches should fix build on both 32 and 64 bit systems.
* Closes #1129, #1461.

Author: dp at xora.org.uk
Branch: org.openembedded.dev
Revision: ad31e71f813b39793fda93f968bef5126ef10111
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ad31e71f813b39793fda93f968bef5126ef10111
Files:
1
packages/enca/files/configure-remove-dumbness.patch
packages/enca/files/makefile-remove-tools.patch
packages/enca/enca_1.9.bb
Diffs:

#
# mt diff -rfcedd5113583dc0d7c0732390bf864e09086a119 -rad31e71f813b39793fda93f968bef5126ef10111
#
# 
# 
# add_file "packages/enca/files/configure-remove-dumbness.patch"
#  content [8a34e59fc23f0379fd177de2f37a8ddc183a72e1]
# 
# add_file "packages/enca/files/makefile-remove-tools.patch"
#  content [20156988497d553668ededd1886680ff30c2e716]
# 
# patch "packages/enca/enca_1.9.bb"
#  from [543a72afa6ea641ac4883557c909bf9fe3ddfed0]
#    to [7815a20c38ea4d3a4b163268f1afc426eb36fbbe]
# 
============================================================
--- packages/enca/files/configure-remove-dumbness.patch	8a34e59fc23f0379fd177de2f37a8ddc183a72e1
+++ packages/enca/files/configure-remove-dumbness.patch	8a34e59fc23f0379fd177de2f37a8ddc183a72e1
@@ -0,0 +1,26 @@
+--- enca-1.9/configure.ac.orig	2006-06-29 15:30:44.000000000 +0100
++++ enca-1.9/configure.ac	2006-06-29 15:31:41.000000000 +0100
+@@ -92,14 +92,15 @@
+ dnl And for gtk-doc
+ gtk_CHECK_GTK_DOC
+ 
+-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
++# This is really dumb code
++#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
============================================================
--- packages/enca/files/makefile-remove-tools.patch	20156988497d553668ededd1886680ff30c2e716
+++ packages/enca/files/makefile-remove-tools.patch	20156988497d553668ededd1886680ff30c2e716
@@ -0,0 +1,13 @@
+--- enca-1.9/Makefile.am.orig	2006-06-29 15:34:55.000000000 +0100
++++ enca-1.9/Makefile.am	2006-06-29 15:35:20.000000000 +0100
+@@ -1,8 +1,8 @@
+ # @(#) $Id: Makefile.am,v 1.35 2005/11/24 10:21:32 yeti Exp $
+ if MAINTAINER_MODE
+-SUBDIRS = tools data script lib src devel-docs test
++SUBDIRS = data script lib src devel-docs test
+ else
+-SUBDIRS = tools script lib src devel-docs
++SUBDIRS = script lib src devel-docs
+ endif
+ man_MANS = man/enca.1
+ 
============================================================
--- packages/enca/enca_1.9.bb	543a72afa6ea641ac4883557c909bf9fe3ddfed0
+++ packages/enca/enca_1.9.bb	7815a20c38ea4d3a4b163268f1afc426eb36fbbe
@@ -1,23 +1,28 @@ HOMEPAGE = "http://trific.ath.cx/softwar
 DESCRIPTION = "Enca is an Extremely Naive Charset Analyser"
 LICENSE = "GPL2"
 SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://trific.ath.cx/software/enca/"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://trific.ath.cx/Ftp//enca/enca-${PV}.tar.bz2 \
 	file://configure-hack.patch;patch=1 \
-	file://dont-run-tests.patch;patch=1 "
+	file://dont-run-tests.patch;patch=1 \
+	file://configure-remove-dumbness.patch;patch=1 \
+	file://makefile-remove-tools.patch;patch=1 "
 
 inherit autotools
 
+EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR}"
+
 do_configure_append() {
 	sed -i s:-I/usr/include::g Makefile
 	sed -i s:-I/usr/include::g */Makefile
 }
 
 do_compile() {
-    cd ${S}/tools && make CC="${BUILD_CC}" CFLAGS="-O2" CPPFLAGS=""
+    cd ${S}/tools && ${BUILD_CC} -o make_hash make_hash.c
+    cd ..
     oe_runmake
 }