diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2019-12-08 22:35:51 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2019-12-08 22:35:51 +0000 |
| commit | 261a97c7e61b2d064f945c1529b8e685c1cd174a (patch) | |
| tree | b29aacb695aca32f2db5c781a6d1be6a2d31900d /editors/openoffice-devel/files | |
| parent | net/pecl-oauth2: Update to 2.0.4 (diff) | |
Attempt to fix gcc builds on powerpc, that were broken by a boost upgrade.
Clang builds using -std=gnu++98 can use the STL headers in
/usr/include/c++/v1, but recent versions of the gcc headers forbid this.
As a fallback, OpenOffice tries to use the TR1 headers supplied by boost,
but recent versions of boost no longer have those headers. In theory
the gcc TR1 headers should work, but I was not able to make those work.
Solve this problem by doing gcc builds using the "bundled" version of
boost which is much older rather that boost from ports.
The headers in the ports version of vigra has some C++11 stuff that
gcc also complains about, so use the "bundled" version of vigra for
gcc builds as well.
The icu patch may only be needed for non-default values of LOCALBASE.
No PORTREVISION bump since amd64 and i386 builds should be unchanged.
Tested by: Curtis Hamilton clhamilto AT gmail.com
Notes
Notes:
svn path=/head/; revision=519579
Diffstat (limited to 'editors/openoffice-devel/files')
| -rw-r--r-- | editors/openoffice-devel/files/patch-configure.ac | 11 | ||||
| -rw-r--r-- | editors/openoffice-devel/files/patch-icu_makefile.mk | 14 |
2 files changed, 25 insertions, 0 deletions
diff --git a/editors/openoffice-devel/files/patch-configure.ac b/editors/openoffice-devel/files/patch-configure.ac new file mode 100644 index 000000000000..dc51ac969e9b --- /dev/null +++ b/editors/openoffice-devel/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2019-11-07 11:05:12 UTC ++++ configure.ac +@@ -2291,7 +2291,7 @@ AC_SUBST(COMNAME) + + if test "$_os" = "FreeBSD"; then + FBSD_GCC_RPATH= +- if "$COM" = "GCC"; then ++ if test "$COM" = "GCC"; then + rpath=`$CC --print-file-name libstdc++.so` + rpath=`realpath $rpath` + rpath=`dirname $rpath` diff --git a/editors/openoffice-devel/files/patch-icu_makefile.mk b/editors/openoffice-devel/files/patch-icu_makefile.mk new file mode 100644 index 000000000000..2e4b7c014a32 --- /dev/null +++ b/editors/openoffice-devel/files/patch-icu_makefile.mk @@ -0,0 +1,14 @@ +--- icu/makefile.mk.orig 2019-09-17 22:55:16 UTC ++++ icu/makefile.mk +@@ -86,6 +86,11 @@ LDFLAGSADD += -Wl,--hash-style=both + LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo + .ENDIF + ++# FreeBSD with gcc from ports needs -Wl,-rpath= to find the matching libstdc++ ++.IF "$(OS)"=="FREEBSD" ++LDFLAGSADD+=$(FBSD_GCC_RPATH) ++.ENDIF ++ + CONFIGURE_DIR=source + + CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)' |