* [gentoo-commits] gentoo-x86 commit in media-gfx/sane-backends: sane-backends-1.0.23-r1.ebuild sane-backends-1.0.23.ebuild ChangeLog
@ 2013-05-08 19:35 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2013-05-08 19:35 UTC (permalink / raw
To: gentoo-commits
vapier 13/05/08 19:35:31
Modified: sane-backends-1.0.23-r1.ebuild
sane-backends-1.0.23.ebuild ChangeLog
Log:
Make cross-compiling work.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Revision Changes Path
1.3 media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild?r1=1.2&r2=1.3
Index: sane-backends-1.0.23-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sane-backends-1.0.23-r1.ebuild 8 May 2013 19:17:34 -0000 1.2
+++ sane-backends-1.0.23-r1.ebuild 8 May 2013 19:35:31 -0000 1.3
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild,v 1.2 2013/05/08 19:17:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild,v 1.3 2013/05/08 19:35:31 vapier Exp $
EAPI="5"
-inherit eutils flag-o-matic multilib udev user
+inherit eutils flag-o-matic multilib udev user toolchain-funcs
# gphoto and v4l are handled by their usual USE flags.
# The pint backend was disabled because I could not get it to compile.
@@ -177,7 +177,6 @@
epatch "${FILESDIR}"/niash_array_index.patch \
"${FILESDIR}"/${PN}-1.0.23-saned_pidfile_location.patch \
"${FILESDIR}"/kodakaio-fixes.patch
-
}
src_configure() {
@@ -227,18 +226,37 @@
}
src_compile() {
- emake VARTEXFONTS="${T}/fonts" || die
+ emake VARTEXFONTS="${T}/fonts"
if use usb; then
cd tools/hotplug
grep -v '^$' libsane.usermap > libsane.usermap.new
mv libsane.usermap.new libsane.usermap
fi
+
+ if tc-is-cross-compiler; then
+ # The build system sucks and doesn't handle this properly.
+ # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+ tc-export_build_env BUILD_CC
+ cd "${S}"/tools
+ ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include \
+ ../sanei/sanei_config.c ../sanei/sanei_constrain_value.c \
+ ../sanei/sanei_init_debug.c sane-desc.c -o sane-desc || die
+ local dirs=( hal hotplug hotplug-ng udev )
+ local targets=(
+ hal/libsane.fdi
+ hotplug/libsane.usermap
+ hotplug-ng/libsane.db
+ udev/libsane.rules
+ )
+ mkdir -p "${dirs[@]}" || die
+ emake "${targets[@]}"
+ fi
}
src_install () {
emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
- docdir="${EPREFIX}"/usr/share/doc/${PF} || die
+ docdir="${EPREFIX}"/usr/share/doc/${PF}
keepdir /var/lib/lock/sane
fowners root:scanner /var/lib/lock/sane
fperms g+w /var/lib/lock/sane
1.17 media-gfx/sane-backends/sane-backends-1.0.23.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23.ebuild?r1=1.16&r2=1.17
Index: sane-backends-1.0.23.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sane-backends-1.0.23.ebuild 22 Feb 2013 21:02:33 -0000 1.16
+++ sane-backends-1.0.23.ebuild 8 May 2013 19:35:31 -0000 1.17
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23.ebuild,v 1.16 2013/02/22 21:02:33 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23.ebuild,v 1.17 2013/05/08 19:35:31 vapier Exp $
EAPI="5"
-inherit eutils flag-o-matic multilib udev user
+inherit eutils flag-o-matic multilib udev user toolchain-funcs
# gphoto and v4l are handled by their usual USE flags.
# The pint backend was disabled because I could not get it to compile.
@@ -230,6 +230,25 @@
grep -v '^$' libsane.usermap > libsane.usermap.new
mv libsane.usermap.new libsane.usermap
fi
+
+ if tc-is-cross-compiler; then
+ # The build system sucks and doesn't handle this properly.
+ # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+ tc-export_build_env BUILD_CC
+ cd "${S}"/tools
+ ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include \
+ ../sanei/sanei_config.c ../sanei/sanei_constrain_value.c \
+ ../sanei/sanei_init_debug.c sane-desc.c -o sane-desc || die
+ local dirs=( hal hotplug hotplug-ng udev )
+ local targets=(
+ hal/libsane.fdi
+ hotplug/libsane.usermap
+ hotplug-ng/libsane.db
+ udev/libsane.rules
+ )
+ mkdir -p "${dirs[@]}" || die
+ emake "${targets[@]}"
+ fi
}
src_install () {
1.225 media-gfx/sane-backends/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.225&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.225&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?r1=1.224&r2=1.225
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- ChangeLog 8 May 2013 19:17:34 -0000 1.224
+++ ChangeLog 8 May 2013 19:35:31 -0000 1.225
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/sane-backends
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.224 2013/05/08 19:17:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.225 2013/05/08 19:35:31 vapier Exp $
+
+ 08 May 2013; Mike Frysinger <vapier@gentoo.org>
+ sane-backends-1.0.23-r1.ebuild, sane-backends-1.0.23.ebuild:
+ Make cross-compiling work.
08 May 2013; Mike Frysinger <vapier@gentoo.org>
sane-backends-1.0.23-r1.ebuild:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-05-08 19:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-08 19:35 [gentoo-commits] gentoo-x86 commit in media-gfx/sane-backends: sane-backends-1.0.23-r1.ebuild sane-backends-1.0.23.ebuild ChangeLog Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox