diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-01-07 00:42:20 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-07 00:42:20 +0000 |
| commit | 1c32531f10033a3fc1fec32822d2ada79814d33c (patch) | |
| tree | 641ea174385e5d1ba33f3f287aa3c621ca9c11ce | |
| parent | 47587af5097b26df091950729fb6c60a5c966fbe (diff) | |
enca 1.9: Fix build.
* These patches should fix build on both 32 and 64 bit systems.
* Closes #1129, #1461.
| -rw-r--r-- | packages/enca/enca_1.9.bb | 11 | ||||
| -rw-r--r-- | packages/enca/files/configure-remove-dumbness.patch | 26 | ||||
| -rw-r--r-- | packages/enca/files/makefile-remove-tools.patch | 13 |
3 files changed, 47 insertions, 3 deletions
diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb index 8151c86865..7f84ebe4fe 100644 --- a/packages/enca/enca_1.9.bb +++ b/packages/enca/enca_1.9.bb @@ -3,21 +3,26 @@ 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 } diff --git a/packages/enca/files/configure-remove-dumbness.patch b/packages/enca/files/configure-remove-dumbness.patch new file mode 100644 index 0000000000..6f6f3e320e --- /dev/null +++ b/packages/enca/files/configure-remove-dumbness.patch @@ -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 diff --git a/packages/enca/files/makefile-remove-tools.patch b/packages/enca/files/makefile-remove-tools.patch new file mode 100644 index 0000000000..accfbccd6b --- /dev/null +++ b/packages/enca/files/makefile-remove-tools.patch @@ -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 + |