From owner-svn-ports-head@freebsd.org Tue Sep 17 22:06:30 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A21E5E84E0; Tue, 17 Sep 2019 22:06:30 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Xxyt3r0fz4kwm; Tue, 17 Sep 2019 22:06:30 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 683511B5C4; Tue, 17 Sep 2019 22:06:30 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8HM6U89076244; Tue, 17 Sep 2019 22:06:30 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8HM6UWt076243; Tue, 17 Sep 2019 22:06:30 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201909172206.x8HM6UWt076243@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Tue, 17 Sep 2019 22:06:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512242 - head/graphics/rawtherapee X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/graphics/rawtherapee X-SVN-Commit-Revision: 512242 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2019 22:06:30 -0000 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}