From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 572F01384A7 for ; Thu, 30 Jul 2015 08:58:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E837214017; Thu, 30 Jul 2015 08:58:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8327314017 for ; Thu, 30 Jul 2015 08:58:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 864FE3403A3 for ; Thu, 30 Jul 2015 08:58:24 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 559) id 67BCE110; Thu, 30 Jul 2015 08:58:23 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/sane-backends: sane-backends-1.0.25_pre20150628.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: sane-backends-1.0.25_pre20150628.ebuild ChangeLog X-VCS-Directories: media-gfx/sane-backends X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20150730085823.67BCE110@oystercatcher.gentoo.org> Date: Thu, 30 Jul 2015 08:58:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3a97a58d-fb23-43f4-b255-e96da0075b1a X-Archives-Hash: bcc79dd1a5d10eca6470c5a5592fe0e7 vapier 15/07/30 08:58:23 Modified: sane-backends-1.0.25_pre20150628.ebuild ChangeLog Log: Move libsane.usermap hacking after we generate the files when cross-compiling (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200) Revision Changes Path 1.3 media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild 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 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 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 Index: sane-backends-1.0.25_pre20150628.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sane-backends-1.0.25_pre20150628.ebuild 30 Jul 2015 08:01:09 -0000 1.2 +++ sane-backends-1.0.25_pre20150628.ebuild 30 Jul 2015 08:58:23 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.25_pre20150628.ebuild,v 1.2 2015/07/30 08:01:09 vapier Exp $ +# $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 $ EAPI="5" @@ -259,17 +259,14 @@ multilib_src_compile() { emake VARTEXFONTS="${T}/fonts" - if use usb; then - cd tools/hotplug || die - sed -i -e '/^$/d' libsane.usermap || die - fi - if tc-is-cross-compiler; then + pushd "${BUILD_DIR}"/tools >/dev/null || die + # 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 "${BUILD_DIR}"/tools || die - ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include -I"${S}"/include \ + ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ + -I. -I../include -I"${S}"/include \ "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die local dirs=( hal hotplug hotplug-ng udev ) @@ -281,6 +278,13 @@ ) mkdir -p "${dirs[@]}" || die emake "${targets[@]}" + + popd >/dev/null + fi + + if use usb; then + sed -i -e '/^$/d' \ + tools/hotplug/libsane.usermap || die fi } 1.276 media-gfx/sane-backends/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.276&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.276&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?r1=1.275&r2=1.276 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v retrieving revision 1.275 retrieving revision 1.276 diff -u -r1.275 -r1.276 --- ChangeLog 30 Jul 2015 08:01:09 -0000 1.275 +++ ChangeLog 30 Jul 2015 08:58:23 -0000 1.276 @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/sane-backends # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.275 2015/07/30 08:01:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.276 2015/07/30 08:58:23 vapier Exp $ + + 30 Jul 2015; Mike Frysinger + sane-backends-1.0.25_pre20150628.ebuild: + Move libsane.usermap hacking after we generate the files when cross-compiling 30 Jul 2015; Mike Frysinger sane-backends-1.0.25_pre20150628.ebuild: