app-i18n/zinnia: import 0.06-r1 from main Gentoo tree.

This version includes fixes for building the Perl extension (unneeded) but
also to use the proper CFLAGS during build (most likely desired).

R=yusukes@chromium.org
BUG=none
TEST=emerge-{arm,x86}-generic and build log check

Change-Id: Ie8769b67a2b5bc2845264627ab0fc44312c29954

Review URL: http://codereview.chromium.org/6814030
This commit is contained in:
Diego Elio Pettenò 2011-04-08 17:19:11 +02:00
parent f5da14a6a8
commit 6503340efc
3 changed files with 110 additions and 0 deletions

View File

@ -0,0 +1,13 @@
Index: zinnia-0.06/perl/Makefile.PL
===================================================================
--- zinnia-0.06.orig/perl/Makefile.PL
+++ zinnia-0.06/perl/Makefile.PL
@@ -4,7 +4,7 @@ WriteMakefile(
'CC' => 'c++',
'LD' => 'c++',
'INC' => '',
- 'LIBS' => '-lzinnia',
+ 'LIBS' => '-L../.libs -lzinnia',
# 'VERSION' => '0.1',
'OBJECT' => 'zinnia_wrap.o'
);

View File

@ -0,0 +1,20 @@
Index: zinnia-0.06/configure.in
===================================================================
--- zinnia-0.06.orig/configure.in
+++ zinnia-0.06/configure.in
@@ -59,15 +59,6 @@ AC_ARG_WITH(pkgconfigdir,
AC_SUBST([pkgconfigdir])
AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}])
-dnl
-dnl check gcc
-dnl
-if test -n "$GCC"; then
- CFLAGS="-O3 -Wall"
- CXXFLAGS="-O3 -Wall"
- AC_MSG_RESULT($ac_cv_x86_sse)
-fi
-
AC_DEFUN(ADD_CC_FLAG, [
AC_MSG_CHECKING(whether ${CC-cc} accepts $1)
AC_LANG_SAVE

View File

@ -0,0 +1,77 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-i18n/zinnia/zinnia-0.06-r1.ebuild,v 1.2 2011/04/07 23:02:45 flameeyes Exp $
EAPI="3"
inherit perl-module flag-o-matic toolchain-funcs autotools
DESCRIPTION="Online hand recognition system with machine learning"
HOMEPAGE="http://zinnia.sourceforge.net/"
SRC_URI="mirror://sourceforge/zinnia/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
#IUSE="perl python ruby"
IUSE="perl"
src_prepare() {
epatch "${FILESDIR}/${P}-ricedown.patch"
epatch "${FILESDIR}/${P}-perl.patch"
eautoreconf
if use perl ; then
(
cd "${S}/perl"
perl-module_src_prepare
)
fi
}
src_configure() {
econf
}
src_compile() {
base_src_compile
if use perl ; then
(
cd "${S}/perl"
# We need to run this here as otherwise it won't pick up the
# just-built -lzinnia and cause the extension to have
# undefined symbols.
perl-module_src_configure
append-cppflags "-I${S}"
append-ldflags "-L${S}/.libs"
emake \
LDDLFLAGS="-shared" \
OTHERLDFLAGS="${LDFLAGS}" \
CC="$(tc-getCXX)" LD="$(tc-getCXX)" \
OPTIMIZE="${CPPFLAGS} ${CXXFLAGS}" \
|| die
)
fi
}
# no tests present
src_test() { :; }
src_install() {
emake DESTDIR="${D}" install || die
find "${D}" -name '*.la' -delete
if use perl ; then
(
cd "${S}/perl"
perl-module_src_install
)
fi
dodoc AUTHORS ChangeLog NEWS README || die
dohtml doc/*.html doc/*.css || die
}