Date: Tue, 17 Sep 2019 22:06:30 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512242 - head/graphics/rawtherapee Message-ID: <201909172206.x8HM6UWt076243@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Tue Sep 17 22:06:29 2019 New Revision: 512242 URL: https://svnweb.freebsd.org/changeset/ports/512242 Log: graphics/rawtherapee: fix a few build glitches In some circumstances, ${_MAKE_JOBS_NUMBER} remains undefined, failing configure. Use ${MAKE_JOBS_NUMBER} instead. Compile time optimizations: * 5.7 regressed in that it would not use ccache. Reintroduce ccache where configured. * Add -fno-fat-lto-objects to CFLAGS. Cleanup duplicate LDFLAGS+=-Wl,--as-needed PR: 240648 Modified: head/graphics/rawtherapee/Makefile Modified: head/graphics/rawtherapee/Makefile ============================================================================== --- head/graphics/rawtherapee/Makefile Tue Sep 17 20:41:58 2019 (r512241) +++ head/graphics/rawtherapee/Makefile Tue Sep 17 22:06:29 2019 (r512242) @@ -30,12 +30,11 @@ USES= cmake desktop-file-utils compiler:gcc-c++11-lib jpeg localbase:ldflags pkgconfig tar:xz DOS2UNIX_REGEX= .*\.(cc|h) -LDFLAGS+= -Wl,--as-needed # fontconfig, freetype, gettext, libX11 USE_GNOME= gtkmm30 librsvg2 USE_GCC= 9+ USE_BINUTILS= yes -_LTO_FLAGS= -flto=${_MAKE_JOBS_NUMBER} -fuse-linker-plugin +_LTO_FLAGS= -flto=${MAKE_JOBS_NUMBER} -fuse-linker-plugin -fno-fat-lto-objects _AR= ${CC:S/gcc/gcc-ar/} _RANLIB= ${CC:S/gcc/gcc-ranlib/} CFLAGS+= -I${LOCALBASE}/include -fPIC ${_LTO_FLAGS} ${_OPT_FLAGS} @@ -62,6 +61,11 @@ INSTALLS_ICONS= yes # and as of GCC 8.3, it appears that among FreeBSD's supported architectures, # only the three listed above support this GCC option. CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1" +.endif + +.if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) +CMAKE_ARGS+= -DCMAKE_C_COMPILER_LAUNCHER=${LOCALBASE}/bin/ccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=${LOCALBASE}/bin/ccache .endif RTDIR= ${PREFIX}/libdata/${PORTNAME}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909172206.x8HM6UWt076243>