| 1 |
vapier 15/07/30 08:58:23 |
| 2 |
|
| 3 |
Modified: sane-backends-1.0.25_pre20150628.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Move libsane.usermap hacking after we generate the files when cross-compiling |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: sane-backends-1.0.25_pre20150628.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- sane-backends-1.0.25_pre20150628.ebuild 30 Jul 2015 08:01:09 -0000 1.2 |
| 23 |
+++ sane-backends-1.0.25_pre20150628.ebuild 30 Jul 2015 08:58:23 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild,v 1.2 2015/07/30 08:01:09 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild,v 1.3 2015/07/30 08:58:23 vapier Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -259,17 +259,14 @@ |
| 33 |
multilib_src_compile() { |
| 34 |
emake VARTEXFONTS="${T}/fonts" |
| 35 |
|
| 36 |
- if use usb; then |
| 37 |
- cd tools/hotplug || die |
| 38 |
- sed -i -e '/^$/d' libsane.usermap || die |
| 39 |
- fi |
| 40 |
- |
| 41 |
if tc-is-cross-compiler; then |
| 42 |
+ pushd "${BUILD_DIR}"/tools >/dev/null || die |
| 43 |
+ |
| 44 |
# The build system sucks and doesn't handle this properly. |
| 45 |
# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 |
| 46 |
tc-export_build_env BUILD_CC |
| 47 |
- cd "${BUILD_DIR}"/tools || die |
| 48 |
- ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include -I"${S}"/include \ |
| 49 |
+ ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ |
| 50 |
+ -I. -I../include -I"${S}"/include \ |
| 51 |
"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ |
| 52 |
"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die |
| 53 |
local dirs=( hal hotplug hotplug-ng udev ) |
| 54 |
@@ -281,6 +278,13 @@ |
| 55 |
) |
| 56 |
mkdir -p "${dirs[@]}" || die |
| 57 |
emake "${targets[@]}" |
| 58 |
+ |
| 59 |
+ popd >/dev/null |
| 60 |
+ fi |
| 61 |
+ |
| 62 |
+ if use usb; then |
| 63 |
+ sed -i -e '/^$/d' \ |
| 64 |
+ tools/hotplug/libsane.usermap || die |
| 65 |
fi |
| 66 |
} |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
1.276 media-gfx/sane-backends/ChangeLog |
| 72 |
|
| 73 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.276&view=markup |
| 74 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.276&content-type=text/plain |
| 75 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?r1=1.275&r2=1.276 |
| 76 |
|
| 77 |
Index: ChangeLog |
| 78 |
=================================================================== |
| 79 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v |
| 80 |
retrieving revision 1.275 |
| 81 |
retrieving revision 1.276 |
| 82 |
diff -u -r1.275 -r1.276 |
| 83 |
--- ChangeLog 30 Jul 2015 08:01:09 -0000 1.275 |
| 84 |
+++ ChangeLog 30 Jul 2015 08:58:23 -0000 1.276 |
| 85 |
@@ -1,6 +1,10 @@ |
| 86 |
# ChangeLog for media-gfx/sane-backends |
| 87 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 88 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.275 2015/07/30 08:01:09 vapier Exp $ |
| 89 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.276 2015/07/30 08:58:23 vapier Exp $ |
| 90 |
+ |
| 91 |
+ 30 Jul 2015; Mike Frysinger <vapier@g.o> |
| 92 |
+ sane-backends-1.0.25_pre20150628.ebuild: |
| 93 |
+ Move libsane.usermap hacking after we generate the files when cross-compiling |
| 94 |
|
| 95 |
30 Jul 2015; Mike Frysinger <vapier@g.o> |
| 96 |
sane-backends-1.0.25_pre20150628.ebuild: |
Archives