svn commit: r459465 - in head/editors/openoffice-4: . files
Don Lewis
truckman at FreeBSD.org
Fri Jan 19 19:40:48 UTC 2018
Author: truckman
Date: Fri Jan 19 19:40:46 2018
New Revision: 459465
URL: https://svnweb.freebsd.org/changeset/ports/459465
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 its 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 r459316
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/ooo.sh files/generate.pl since they have
been obsolete for a long while.
No PORTREVISION bump since the package should be unchanged.
PR: 224276
Deleted:
head/editors/openoffice-4/files/generate.pl
head/editors/openoffice-4/files/ooo.sh
Modified:
head/editors/openoffice-4/Makefile
Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile Fri Jan 19 19:28:08 2018 (r459464)
+++ head/editors/openoffice-4/Makefile Fri Jan 19 19:40:46 2018 (r459465)
@@ -138,14 +138,13 @@ WITHOUT_CPU_CFLAGS= true
CPE_PRODUCT= ${PORTNAME:S|apache-||}
CPE_VENDOR= apache
-OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA SDK WIKI_PUBLISHER CCACHE
+OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA SDK WIKI_PUBLISHER
OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER
GNOME_DESC= GConf + screensaver presentation control via DBUS
GNOMEVFS_DESC= GNOME Virtual File System
MMEDIA_DESC= Multimedia backend for impress
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
@@ -207,19 +206,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
@@ -415,10 +403,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:
More information about the svn-ports-head
mailing list