diff options
| author | jkim <jkim@FreeBSD.org> | 2013-10-31 06:33:22 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-10-31 06:33:22 +0800 |
| commit | b5579cc9da051ecddf67d725c6656985fa9df3c1 (patch) | |
| tree | eeef729e9e8e4c6dba238b09a68b0dc8ba12b6b1 /editors/libreoffice | |
| parent | 18ef60144b4fea8dab07541a961a9091007a8ade (diff) | |
| download | freebsd-ports-gnome-b5579cc9da051ecddf67d725c6656985fa9df3c1.tar.gz freebsd-ports-gnome-b5579cc9da051ecddf67d725c6656985fa9df3c1.tar.zst freebsd-ports-gnome-b5579cc9da051ecddf67d725c6656985fa9df3c1.zip | |
- Fix build with lang/clang33. It was executing ld(1) from the base. [1]
- Fix build with bmake(1). [2]
- Add an option to increase build verbosity to debug build issues.
Reported by: ale [1]
Analyzed by: tijl [1]
Submitted by: brooks [1]
Submitted by: tijl [2]
Diffstat (limited to 'editors/libreoffice')
| -rw-r--r-- | editors/libreoffice/Makefile | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 973363c696e7..05776785a8cb 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -159,7 +159,7 @@ CONFIGURE_ARGS+= --disable-epm \ --without-system-mozilla OPTIONS_DEFINE= CUPS DEBUG GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK \ - SYSTRAY TEST WEBDAV + SYSTRAY TEST VERBOSE WEBDAV OPTIONS_DEFAULT=CUPS GTK2 JAVA_DESC= Add java support (XML Filters, macros) @@ -168,6 +168,7 @@ PGSQL_DESC= Build with PostgreSQL-SDBC driver SDK_DESC= Build with SDK SYSTRAY_DESC= Enable systemtray quickstarter TEST_DESC= Run all regression tests +VERBOSE_DESC= Increase build verbosity WEBDAV_DESC= Enable webdav protocol .include <bsd.port.options.mk> @@ -183,12 +184,17 @@ CONFIGURE_ARGS+= --disable-cups IGNORE= known as broken CONFIGURE_ARGS+= --enable-debug \ --enable-dbgutil \ - --enable-verbose \ --enable-crashdump .else CONFIGURE_ARGS+= --enable-release-build .endif +.if ${PORT_OPTIONS:MDEBUG} || ${PORT_OPTIONS:MVERBOSE} +CONFIGURE_ARGS+= --enable-verbose +.else +CONFIGURE_ARGS+= --disable-verbose +.endif + .if ${PORT_OPTIONS:MGNOME} LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib USE_GNOME+= gconf2 @@ -320,8 +326,9 @@ CONFIGURE_ARGS+= --disable-neon .include <bsd.port.pre.mk> -.if ${CXX:M${LOCALBASE}/bin/clang++} +.if ${CXX:M${LOCALBASE}/bin/clang++*} USE_BINUTILS= yes +LDFLAGS= -B${LOCALBASE}/bin .endif .if ${COMPILER_FEATURES:Mlibc++} @@ -334,9 +341,9 @@ CONFIGURE_ARGS+= --with-linker-hash-style=sysv ACLOCAL_ARGS= -I "${WRKSRC}/m4" CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV+= ENVCFLAGS="${CFLAGS}" ENVCXXFLAGS="${CXXFLAGS}" +MAKE_ENV+= ENVCFLAGS="${CFLAGS}" ENVCFLAGSCXX="${CXXFLAGS}" MAKE_ENV+= ENVLINKFLAGS="${LDFLAGS}" MAKE_ENV+= LANG=C LC_ALL=C MAKE_ENV+= SED="${LOCALBASE}/bin/gsed" USE_GMAKE=1 |