diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2018-12-11 10:10:02 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2018-12-11 10:10:02 +0000 |
| commit | c06409c76b6e5831ff06d3cd251af01b8228e4bb (patch) | |
| tree | 7d1d225f29646e0422140858244af3016287d2f2 /editors/openoffice-4/Makefile | |
| parent | - Add LICENSE (diff) | |
Spell CHOSEN_COMPILER_TYPE correctly
PR: 199098
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=487230
Diffstat (limited to 'editors/openoffice-4/Makefile')
| -rw-r--r-- | editors/openoffice-4/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index ff0145744e25..1cbba62f64e3 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -207,9 +207,9 @@ CONFIGURE_ARGS+= --enable-symbols .include <${FILESDIR}/Makefile.localized> -.if ${COMPILER_TYPE} == clang +.if ${CHOSEN_COMPILER_TYPE} == clang CPPFLAGS+= -I${LOCALBASE}/include -. if ${COMPILER_VERSION} >= 40 && ${ARCH} == amd64 +. if ${ARCH} == amd64 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-align16 . endif .endif @@ -368,7 +368,7 @@ post-patch: ${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \ ${WRKSRC}/desktop/scripts/soffice.sh ${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE} -.if ${COMPILER_TYPE} == gcc +.if ${CHOSEN_COMPILER_TYPE} == gcc # g++49 -Os sometimes leaves inline class methods undefined, # affects fmgridif.cxx and ColumnControl.cxx # See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009> @@ -376,7 +376,7 @@ post-patch: ${REINPLACE_CMD} -e "s/ := -Os/ := -Os -fno-devirtualize -fno-devirtualize-speculatively/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk; \ ${REINPLACE_CMD} -e "s/=-Os /=-Os -fno-devirtualize -fno-devirtualize-speculatively /" ${WRKSRC}/solenv/inc/unxfbsdi.mk; \ fi -.elif ${ARCH} == i386 && ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36 +.elif ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == clang # autodoc and uno (bridgetest) core dump when built with with -Os # on i386, affects file.cxx and bridgetest.cxx (at least). # Using -O2 optimiztion works, and -Os is essentially -O2 with out |