From owner-svn-ports-all@freebsd.org Sat Jan 20 00:51:40 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB928ED2C70; Sat, 20 Jan 2018 00:51:40 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 969457F4AF; Sat, 20 Jan 2018 00:51:40 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE9C31508E; Sat, 20 Jan 2018 00:51:39 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0K0pdfZ006587; Sat, 20 Jan 2018 00:51:39 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0K0pdHS006586; Sat, 20 Jan 2018 00:51:39 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201801200051.w0K0pdHS006586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Sat, 20 Jan 2018 00:51:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459491 - in head/editors/openoffice-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: in head/editors/openoffice-devel: . files X-SVN-Commit-Revision: 459491 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jan 2018 00:51:40 -0000 Author: truckman Date: Sat Jan 20 00:51:39 2018 New Revision: 459491 URL: https://svnweb.freebsd.org/changeset/ports/459491 Log: Remove the CCACHE option and other ccache code from the Makefile and use the ccache code in the ports framework handle all of the details. Don't prepend ${WRKSRC}/solenv/bin to PATH in CONFIGURE_ENV since it is no longer needed and blocks the framework from adding CCACHE_WRAPPER_PATH to PATH in CONFIGURE_ENV and MAKE_ENV. Sanitize MAKE_ENV and export it to the build, similar to what is done by the default do-build target. This passes CCACHE_DIR and HOME (set to WRKDIR) to the build, so the $HOME override in r459363 is no longer needed. We need to remove the CPPFLAGS setting from MAKE_ENV before exporting to the build because it breaks the build of the bundled icu module. CFLAGS and CXXFLAGS are also removed because they would interfere with the carefully constructed compiler flags set by the port. The include paths are already handled by the port, and the port also modifies the optmization flags for some files to work around compiler bugs. While here, remove files/generate.pl since it has been obsolete for a long while. No PORTREVISION bump since the package should be unchanged. PR: 224276 Deleted: head/editors/openoffice-devel/files/generate.pl Modified: head/editors/openoffice-devel/Makefile Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Sat Jan 20 00:25:19 2018 (r459490) +++ head/editors/openoffice-devel/Makefile Sat Jan 20 00:51:39 2018 (r459491) @@ -151,7 +151,7 @@ CPE_PRODUCT= ${PORTNAME:S|apache-||} CPE_VENDOR= apache OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA MYSQL PDFIMPORT \ - REPORT_BUILDER SDK WIKI_PUBLISHER CCACHE + REPORT_BUILDER SDK WIKI_PUBLISHER OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT WIKI_PUBLISHER GNOME_DESC= GConf + screensaver presentation control via DBUS GNOMEVFS_DESC= GNOME Virtual File System @@ -161,7 +161,6 @@ PDFIMPORT_DESC= Build and install PDF import extensio REPORT_BUILDER_DESC= Build and install Report builder extension (Broken) SDK_DESC= Build and install software development kit WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension -CCACHE_DESC= Mimimize compile time of C/C++ programs CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups @@ -243,19 +242,8 @@ PACKAGE_PREFIX= Apache_OpenOffice LOCALIZED_LANG?= en-US -.if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE) -BUILD_DEPENDS+= ccache:devel/ccache -CCACHE_PREFIX= ccache -AOOCC= ${CCACHE_PREFIX} ${CC} -AOOCXX= ${CCACHE_PREFIX} ${CXX} -.else -AOOCC= ${CC} -AOOCXX= ${CXX} -.endif +AOO_MAKE_ENV= ${MAKE_ENV:NCPPFLAGS=*:NCFLAGS=*:NCXXFLAGS=*} -CONFIGURE_ENV+= CC="${AOOCC}" CXX="${AOOCXX}" \ - PATH=${WRKSRC}/solenv/bin:$$PATH - GNU_CONFIGURE= yes WRKSUBDIR= ${WRKDIR}/aoo-${AOOVERSION} WRKSRC?= ${WRKSUBDIR}/main @@ -449,10 +437,8 @@ do-build: fi ; \ fi ; \ cd ${WRKSRC}/instsetoo_native ; \ + export ${AOO_MAKE_ENV} ; \ . ../${FREEBSD_ENV_SET} ; \ - if [ -n "${HOME}" -a ! -w "${HOME}" ]; then \ - export HOME=/tmp ; \ - fi ; \ build.pl --all -P$${numproc} -- -P$${dmproc} do-install: