diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-08-22 12:13:54 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-08-22 12:13:54 +0000 |
| commit | b50c71c1540622d19ad29f59972b5daaff4c77d1 (patch) | |
| tree | d638c50a14b8fbdef44a1fcdef91dfd610dd3c88 /net-dialup/slmodem | |
| parent | * bump and ~amd64 keyword (diff) | |
| download | gentoo-2-b50c71c1540622d19ad29f59972b5daaff4c77d1.tar.gz gentoo-2-b50c71c1540622d19ad29f59972b5daaff4c77d1.tar.bz2 gentoo-2-b50c71c1540622d19ad29f59972b5daaff4c77d1.zip | |
Fix problems with amd64 and eselect compiler, thanks to Kazuo Teramoto <kaz.rag@gmail.com> in bug 140564
(Portage version: 2.1.1_pre5-r2)
Diffstat (limited to 'net-dialup/slmodem')
| -rw-r--r-- | net-dialup/slmodem/ChangeLog | 8 | ||||
| -rw-r--r-- | net-dialup/slmodem/files/slmodem-2.9.11-modem-cc-makefile.patch | 11 | ||||
| -rw-r--r-- | net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild | 7 |
3 files changed, 22 insertions, 4 deletions
diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog index 1922ea5afae8..124901b84e14 100644 --- a/net-dialup/slmodem/ChangeLog +++ b/net-dialup/slmodem/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dialup/slmodem # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.66 2006/07/19 13:59:29 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.67 2006/08/22 12:13:54 genstef Exp $ + + 22 Aug 2006; Stefan Schweizer <genstef@gentoo.org> + +files/slmodem-2.9.11-modem-cc-makefile.patch, + slmodem-2.9.11_pre20051101.ebuild: + Fix problems with amd64 and eselect compiler, thanks to Kazuo Teramoto + <kaz.rag@gmail.com> in bug 140564 27 May 2006; Stefan Schweizer <genstef@gentoo.org> files/slmodem-2.9.11-modem-makefile.patch: diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-modem-cc-makefile.patch b/net-dialup/slmodem/files/slmodem-2.9.11-modem-cc-makefile.patch new file mode 100644 index 000000000000..cdcef462a085 --- /dev/null +++ b/net-dialup/slmodem/files/slmodem-2.9.11-modem-cc-makefile.patch @@ -0,0 +1,11 @@ +--- slmodem-2.9.11-20051101/modem/Makefile.orig 2006-08-22 08:45:44.000000000 -0300 ++++ slmodem-2.9.11-20051101/modem/Makefile 2006-08-22 08:46:04.000000000 -0300 +@@ -13,7 +13,7 @@ + # + ########################################################################### + +-CC:= gcc ++CC?= gcc + RM:= rm -f + + CFLAGS+= -Wall -g -finline -I. -DCONFIG_DEBUG_MODEM diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild index 67fe4476bc05..cbac71474945 100644 --- a/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild +++ b/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild,v 1.7 2006/07/19 13:59:29 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild,v 1.8 2006/08/22 12:13:54 genstef Exp $ inherit eutils linux-mod multilib @@ -21,7 +21,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P/_pre/-} pkg_setup() { - has_multilib_profile && ABI=x86 + use amd64 && multilib_toolchain_setup x86 MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem)" if ! use amd64; then @@ -44,6 +44,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/${P%%_*}-modem-makefile.patch" + epatch "${FILESDIR}/${P%%_*}-modem-cc-makefile.patch" cd drivers sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile convert_to_m Makefile @@ -59,7 +60,7 @@ src_compile() { fi emake ${MAKE_PARAMS} modem || die "failed to build modem" - has_multilib_profile && ABI=${DEFAULT_ABI} + use amd64 && multilib_toolchain_setup amd64 linux-mod_src_compile } |