summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsainty <dsainty@pkgsrc.org>2013-11-20 11:00:43 +0000
committerdsainty <dsainty@pkgsrc.org>2013-11-20 11:00:43 +0000
commite20a2f6d8a2c866d4092062e43c575ff0f42b8e9 (patch)
tree107122d1ff152d90db3cd447f5484377274a577b
parentf3c89c79533524d1dbe4f26a63c9577dae56d520 (diff)
downloadpkgsrc-e20a2f6d8a2c866d4092062e43c575ff0f42b8e9.tar.gz
GCC now wants zlib - and comes with an internal copy as an alternative to
using the system/Pkgsrc zlib. At least on Ubuntu, the internal zlib fails to get past configuration. Use the standard Pkgsrc (or builtin) zlib instead. Bump PKGREVISION to reflect the minor difference in build strategy.
-rw-r--r--cross/avr-gcc/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index caddd4f103b..3a0c73ab018 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2013/08/27 15:41:05 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2013/11/20 11:00:43 dsainty Exp $
DISTNAME= gcc-4.5.3
PKGNAME= avr-gcc-4.5.3
+PKGREVISION= 1
CATEGORIES= cross
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/releases/${DISTNAME}/}
EXTRACT_SUFX= .tar.bz2
@@ -25,6 +26,7 @@ USE_GNU_CONFIGURE_HOST= no
CONFIGURE_ARGS+= --target=avr
CONFIGURE_ARGS+= --disable-nls --disable-lto
CONFIGURE_ARGS+= --enable-multilib
+CONFIGURE_ARGS+= --with-system-zlib
MAKE_ENV+= MACHINE_ARCH=avr
MAKE_ENV+= SHELL=${CONFIG_SHELL}
@@ -49,6 +51,7 @@ CONFIGURE_SCRIPT= ${WRKSRC}/configure
INSTALLATION_DIRS+= avr/bin
.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../math/mpfr/buildlink3.mk"
# mpc is required since gcc-4.5.x
.include "../../math/mpcomplex/buildlink3.mk"