Sun Dec 8 22:27:57 2013 UTC ()
Make sure GCC's unwind.h is picked up and not a potential copy from
/usr/include.


(joerg)
diff -r1.32 -r1.33 pkgsrc/cross/avr-gcc/Makefile
cvs diff -r1.32 -r1.33 pkgsrc/cross/avr-gcc/Makefile (expand / switch to unified diff)

--- pkgsrc/cross/avr-gcc/Makefile 2013/11/20 11:00:43 1.32
+++ pkgsrc/cross/avr-gcc/Makefile 2013/12/08 22:27:57 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.32 2013/11/20 11:00:43 dsainty Exp $ 1# $NetBSD: Makefile,v 1.33 2013/12/08 22:27:57 joerg Exp $
2 2
3DISTNAME= gcc-4.5.3 3DISTNAME= gcc-4.5.3
4PKGNAME= avr-gcc-4.5.3 4PKGNAME= avr-gcc-4.5.3
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= cross 6CATEGORIES= cross
7MASTER_SITES= ${MASTER_SITE_GNU:=gcc/releases/${DISTNAME}/} 7MASTER_SITES= ${MASTER_SITE_GNU:=gcc/releases/${DISTNAME}/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9DISTFILES= ${DISTNAME:S/-/-core-/}${EXTRACT_SUFX} \ 9DISTFILES= ${DISTNAME:S/-/-core-/}${EXTRACT_SUFX} \
10 ${DISTNAME:S/-/-g++-/}${EXTRACT_SUFX} 10 ${DISTNAME:S/-/-g++-/}${EXTRACT_SUFX}
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13COMMENT= GNU gcc-4.5 for Atmel AVR 8-bit RISC microcontrollers 13COMMENT= GNU gcc-4.5 for Atmel AVR 8-bit RISC microcontrollers
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
@@ -34,25 +34,26 @@ CFLAGS_FOR_BUILD:= ${CFLAGS} @@ -34,25 +34,26 @@ CFLAGS_FOR_BUILD:= ${CFLAGS}
34MAKE_ENV+= CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD:Q} 34MAKE_ENV+= CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD:Q}
35CXXFLAGS_FOR_BUILD:= ${CXXFLAGS} 35CXXFLAGS_FOR_BUILD:= ${CXXFLAGS}
36MAKE_ENV+= CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD:Q} 36MAKE_ENV+= CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD:Q}
37CFLAGS= # empty 37CFLAGS= # empty
38CXXFLAGS= # empty 38CXXFLAGS= # empty
39 39
40SUBST_CLASSES+= sed 40SUBST_CLASSES+= sed
41SUBST_FILES.sed= fixincludes/fixincl.x 41SUBST_FILES.sed= fixincludes/fixincl.x
42SUBST_SED.sed= -e 's|@SED@|${TOOLS_PATH.sed}|g' 42SUBST_SED.sed= -e 's|@SED@|${TOOLS_PATH.sed}|g'
43SUBST_STAGE.sed= post-patch 43SUBST_STAGE.sed= post-patch
44 44
45pre-configure: 45pre-configure:
46 ${MKDIR} ${WRKDIR}/obj 46 ${MKDIR} ${WRKDIR}/obj
 47 ${LN} -s ${WRKDIR}/obj/gcc/include/unwind.h ${WRKSRC}/gcc/unwind.h
47 48
48CONFIGURE_DIRS= ${WRKDIR}/obj 49CONFIGURE_DIRS= ${WRKDIR}/obj
49CONFIGURE_SCRIPT= ${WRKSRC}/configure 50CONFIGURE_SCRIPT= ${WRKSRC}/configure
50 51
51INSTALLATION_DIRS+= avr/bin 52INSTALLATION_DIRS+= avr/bin
52 53
53.include "../../devel/gmp/buildlink3.mk" 54.include "../../devel/gmp/buildlink3.mk"
54.include "../../devel/zlib/buildlink3.mk" 55.include "../../devel/zlib/buildlink3.mk"
55.include "../../math/mpfr/buildlink3.mk" 56.include "../../math/mpfr/buildlink3.mk"
56# mpc is required since gcc-4.5.x 57# mpc is required since gcc-4.5.x
57.include "../../math/mpcomplex/buildlink3.mk" 58.include "../../math/mpcomplex/buildlink3.mk"
58.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"