Mon Jul 23 12:47:55 2012 UTC ()
Update binutils detection on Solaris to match current reality.


(jperkin)
diff -r1.4 -r1.5 pkgsrc/lang/gcc47/Makefile
cvs diff -r1.4 -r1.5 pkgsrc/lang/gcc47/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc47/Attic/Makefile 2012/07/12 13:47:23 1.4
+++ pkgsrc/lang/gcc47/Attic/Makefile 2012/07/23 12:47:55 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2012/07/12 13:47:23 marino Exp $ 1# $NetBSD: Makefile,v 1.5 2012/07/23 12:47:55 jperkin Exp $
2 2
3GCC_PKGNAME= gcc47 3GCC_PKGNAME= gcc47
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC_DIST_VERSION} 6DISTNAME= gcc-${GCC_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC_DIST_VERSION}
8PKGREVISION= 3 8PKGREVISION= 3
9CATEGORIES= lang 9CATEGORIES= lang
10MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/} 10MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/}
11EXTRACT_SUFX= .tar.bz2 11EXTRACT_SUFX= .tar.bz2
12 12
13MAINTAINER= sbd@NetBSD.org 13MAINTAINER= sbd@NetBSD.org
14HOMEPAGE= http://gcc.gnu.org/ 14HOMEPAGE= http://gcc.gnu.org/
@@ -68,33 +68,43 @@ MAKE_ENV+= ac_cv_func_clock_gettime=yes @@ -68,33 +68,43 @@ MAKE_ENV+= ac_cv_func_clock_gettime=yes
68CONFIGURE_ARGS+= --disable-bootstrap 68CONFIGURE_ARGS+= --disable-bootstrap
69.endif 69.endif
70 70
71.include "options.mk" 71.include "options.mk"
72 72
73# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into 73# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
74# a binary so we need to make sure we give it the installed sed and not 74# a binary so we need to make sure we give it the installed sed and not
75# the tool wrapped one. 75# the tool wrapped one.
76MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED} 76MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
77MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} 77MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
78 78
79# Determine whether to use binutils 79# Determine whether to use binutils
80.if ${OPSYS} == "SunOS" 80.if ${OPSYS} == "SunOS"
 81. if exists(/usr/sfw/bin/gobjdump)
81CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 82CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
 83. endif
 84. if exists(/usr/bin/ld)
 85CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
 86. else
82CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 87CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
83. if !exists(/usr/sfw/bin/gas) 88. endif
84CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as 89. if exists(/usr/sfw/bin/gas)
85. else 
86CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas 90CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
87. endif 91. elif exists(/usr/ccs/bin/as)
 92CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
 93. else
 94BUILDLINK_DEPMETHOD.binutils= full
 95. include "../../devel/binutils/buildlink3.mk"
 96CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/gnu/bin/as
 97. endif
88.endif 98.endif
89 99
90pre-configure: 100pre-configure:
91 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR} 101 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
92 102
93TEST_TARGET= -k check || ${TRUE} 103TEST_TARGET= -k check || ${TRUE}
94pre-test: 104pre-test:
95 ${RUN} \ 105 ${RUN} \
96 if runtest --version >/dev/null 2>/dev/null ; then \ 106 if runtest --version >/dev/null 2>/dev/null ; then \
97 : ; \ 107 : ; \
98 else \ 108 else \
99 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \ 109 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
100 exit 1 ; \ 110 exit 1 ; \