diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2018-01-18 16:51:56 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2018-01-18 16:51:56 +0000 |
| commit | 1c0aec0a94b886c11ceb188f693a35e1ddc0d563 (patch) | |
| tree | bc6682f4a0c3ede86f4f25ef0fabbbf5482bcd8e /editors/openoffice-devel/files | |
| parent | Update to the 20180117 snapshot of GCC 6.4.1. (diff) | |
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
Notes
Notes:
svn path=/head/; revision=459363
Diffstat (limited to 'editors/openoffice-devel/files')
| -rw-r--r-- | editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk | 10 | ||||
| -rw-r--r-- | editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk | 11 |
2 files changed, 21 insertions, 0 deletions
diff --git a/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk new file mode 100644 index 000000000000..acee2d1a51ee --- /dev/null +++ b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk @@ -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 diff --git a/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk new file mode 100644 index 000000000000..f91d88004b2d --- /dev/null +++ b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk @@ -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" |