ports/135883: [PATCH] lang/gcc295: Unbreak build

[Ulrich Spoerlein]

>Number:         135883
>Category:       ports
>Synopsis:       [PATCH] lang/gcc295: Unbreak build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 21 09:30:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Ulrich Spoerlein
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
>Description:
The changes to autoconf'ed ports, regarding the LATE_CONFIGURE_ARGS broken
this port. By rolling our own do-configure target and passing the right
combination of --build and --host, this port still builds and works fine.

Port maintainer (shaun at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- gcc-2.95.3_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /tank/ncvs/ports/lang/gcc295/Makefile,v
retrieving revision 1.113
diff -u -p -u -r1.113 Makefile
--- Makefile	5 Jan 2009 20:36:29 -0000	1.113
+++ Makefile	21 Jun 2009 09:27:40 -0000
@@ -32,7 +32,6 @@ IGNORE=	you have the 'USE_GCC' variable 
 
 .if (${ARCH} == alpha)
 BROKEN=			Does not compile on alpha
-WITHOUT_CPU_CFLAGS=	yes
 .endif
 
 WITHOUT_CPU_CFLAGS=	yes
@@ -47,6 +46,7 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld \
 		--with-gxx-include-dir=${TARGLIB}/include/g++
 #CONFIGURE_ARGS+=	--program-suffix=-295
+CONFIGURE_ARGS+=	--build=${CONFIGURE_TARGET} --host=${CONFIGURE_TARGET}
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -78,6 +78,29 @@ pre-configure:
 	@${TOUCH} ${WRKSRC}/gcc/configure
 	@${TOUCH} ${WRKSRC}/gcc/cstamp-h.in
 
+# The LATE_ARGS mess up gcc's configure script. Roll our own target here
+do-configure:
+	CONFIG_GUESS_DIRS=$$(${FIND} ${WRKDIR} -name config.guess -o -name config.sub \
+		| ${XARGS} -n 1 ${DIRNAME}); \
+	for _D in $${CONFIG_GUESS_DIRS}; do \
+		${CP} -f ${TEMPLATES}/config.guess $${_D}/config.guess; \
+		${CHMOD} a+rx $${_D}/config.guess; \
+	    ${CP} -f ${TEMPLATES}/config.sub $${_D}/config.sub; \
+		${CHMOD} a+rx $${_D}/config.sub; \
+	done
+	(cd ${CONFIGURE_WRKSRC} && \
+		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
+	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
+	    INSTALL_DATA="${INSTALL_DATA}" \
+	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
+			 ${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
+			 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
+			 ${FALSE}; \
+		fi)
+
 pre-install:
 	${MKDIR} ${PREFIX}/info
 
--- gcc-2.95.3_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: