From owner-svn-ports-head@FreeBSD.ORG Thu Sep 5 06:07:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 440EE9B7; Thu, 5 Sep 2013 06:07:31 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 315E72CFF; Thu, 5 Sep 2013 06:07:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8567V2t068992; Thu, 5 Sep 2013 06:07:31 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8567Vp5068991; Thu, 5 Sep 2013 06:07:31 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201309050607.r8567Vp5068991@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 5 Sep 2013 06:07:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326354 - head/devel/hp48xgcc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Sep 2013 06:07:31 -0000 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 \