Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Jan 2018 07:31:31 +0000 (UTC)
From:      Don Lewis <truckman@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r459316 - in head/editors/openoffice-4: . files
Message-ID:  <201801180731.w0I7VVY6054148@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: truckman
Date: Thu Jan 18 07:31:31 2018
New Revision: 459316
URL: https://svnweb.freebsd.org/changeset/ports/459316

Log:
  Fix editors/openoffice-4 build with clang 6.0.0 by compiling with
  -std=gnu++98 since that was the default for the compilers historically
  used for the build.  It turns out that -std=c++98 does not work
  because the vigra headers depend on LLONG_MAX and friends, which
  are not defined without the GNU extensions.
  
  Compensate for a recent poudriere change by overriding $HOME and
  setting it to /tmp if $HOME is not writeable.  Some of the test
  code run during the build wants to use mkstemp() to create temporary
  directories under $HOME, which does not work for the "nobody" user
  which points $HOME at /nonexistent.
  
  No PORTREVISION bump since this is a build fix and there is no
  change to the package.
  
  PR:		225129
  Reported by:	jbeich

Added:
  head/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk   (contents, props changed)
  head/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk   (contents, props changed)
Modified:
  head/editors/openoffice-4/Makefile

Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile	Thu Jan 18 04:11:02 2018	(r459315)
+++ head/editors/openoffice-4/Makefile	Thu Jan 18 07:31:31 2018	(r459316)
@@ -416,7 +416,10 @@ do-build:
 	fi ;								  \
 	cd ${WRKSRC}/instsetoo_native ;					  \
 	. ../${FREEBSD_ENV_SET} ;					  \
-	build.pl --all -P$${numproc} -- -P$${dmproc}
+	if [ -n "${HOME}" -a ! -w "${HOME}" ]; then			  \
+		export HOME=/tmp ;					  \
+	fi ;								  \
+	HOME=/tmp build.pl --all -P$${numproc} -- -P$${dmproc}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \

Added: head/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk	Thu Jan 18 07:31:31 2018	(r459316)
@@ -0,0 +1,10 @@
+--- solenv/gbuild/platform/freebsd.mk.orig	2017-11-27 13:50:25 UTC
++++ solenv/gbuild/platform/freebsd.mk
+@@ -94,6 +94,7 @@ gb_CXXFLAGS := \
+ 	-fno-use-cxa-atexit \
+ 	-fvisibility-inlines-hidden \
+ 	-fvisibility=hidden \
++	-std=gnu++98 \
+ 	-pipe
+ ifeq ($(COM),CLANG)
+ gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH

Added: head/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk	Thu Jan 18 07:31:31 2018	(r459316)
@@ -0,0 +1,11 @@
+--- solenv/inc/unxfbsd.mk.orig	2017-11-27 13:50:28 UTC
++++ solenv/inc/unxfbsd.mk
+@@ -96,7 +96,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+ 
+ # -fpermissive should be removed as soon as possible
+-CFLAGSCXX= -pipe $(ARCH_FLAGS) 
++CFLAGSCXX= -pipe $(ARCH_FLAGS) -std=gnu++98
+ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+ CFLAGSCXX += -fvisibility-inlines-hidden
+ .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"



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