Date: Wed, 30 Oct 2013 22:33:23 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332185 - head/editors/libreoffice Message-ID: <201310302233.r9UMXNhe078602@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Oct 30 22:33:22 2013 New Revision: 332185 URL: http://svnweb.freebsd.org/changeset/ports/332185 Log: - 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] Modified: head/editors/libreoffice/Makefile Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Wed Oct 30 22:13:56 2013 (r332184) +++ head/editors/libreoffice/Makefile Wed Oct 30 22:33:22 2013 (r332185) @@ -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 d 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-styl 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310302233.r9UMXNhe078602>