Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Sep 2013 06:07:31 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r326354 - head/devel/hp48xgcc
Message-ID:  <201309050607.r8567Vp5068991@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Thu Sep  5 06:07:30 2013
New Revision: 326354
URL: http://svnweb.freebsd.org/changeset/ports/326354

Log:
  - Unbreak against Clang and other strict C++ compilers
  - Sanitize some post-extract commands while I'm here
  
  Reported by:	pkg-fallout

Modified:
  head/devel/hp48xgcc/Makefile

Modified: head/devel/hp48xgcc/Makefile
==============================================================================
--- head/devel/hp48xgcc/Makefile	Thu Sep  5 05:46:47 2013	(r326353)
+++ head/devel/hp48xgcc/Makefile	Thu Sep  5 06:07:30 2013	(r326354)
@@ -26,7 +26,7 @@ USE_ZIP=	yes
 
 GCC_VER=	2.7.2
 GCC_DIR=	${WRKDIR}/gcc-${GCC_VER}
-PLIST_SUB+=	GCC_VER=${GCC_VER}
+PLIST_SUB=	GCC_VER=${GCC_VER}
 WRKSRC=		${WRKDIR}/saturn
 ALL_TARGET=	default
 INSTALL_TARGET=	build-lib
@@ -37,10 +37,9 @@ MAKE_ARGS=	GCC_SRC="${GCC_DIR}" GCC_VERS
 
 post-extract: .SILENT
 # Extract GCC distribution separately because of USE_ZIP/.tar.gz conflict
-	cd ${WRKDIR} && ${GZIP_CMD} -dc \
-		${_DISTDIR}/gcc-${GCC_VER}.tar.gz | ${TAR} -xf -
+	${TAR} xzf ${_DISTDIR}/gcc-${GCC_VER}.tar.gz -C ${WRKDIR}
 # Patch GCC a bit
-	cd ${GCC_DIR} && ${PATCH} -s < ${WRKSRC}/gcc-target/patches-${GCC_VER}
+	${PATCH} -d ${GCC_DIR} -s < ${WRKSRC}/gcc-target/patches-${GCC_VER}
 # Prepare GCC by creating proper config symlink
 	${LN} -sf ../../saturn/gcc-target/config-saturn ${GCC_DIR}/config/saturn
 # Allow GCC to build in our environment
@@ -50,6 +49,8 @@ post-extract: .SILENT
 	${ECHO_CMD} '#define HAVE_VPRINTF' >> ${GCC_DIR}/config/xm-freebsd.h
 # Do not install extra copies of GPL (we use license framework instead)
 	${REINPLACE_CMD} -e '/COPYING/d' ${WRKSRC}/make.pubfiles
+# Unbreak against Clang and other strict C++ compilers
+	${REINPLACE_CMD} -e 's/main (/int &void/' ${WRKSRC}/objdump/bool.cc
 
 do-configure:
 	cd ${GCC_DIR} && ./configure --target=saturn-local-hp48 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309050607.r8567Vp5068991>