git: 346b0e795afb - main - graphics/darktable: prepare for cmake-3.21 update

Tobias C. Berner tcberner at FreeBSD.org
Thu Jul 29 08:02:44 UTC 2021


The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=346b0e795afbd973672e213dd310b9239ee7ff6c

commit 346b0e795afbd973672e213dd310b9239ee7ff6c
Author:     Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-07-29 07:58:07 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
CommitDate: 2021-07-29 07:58:53 +0000

    graphics/darktable: prepare for cmake-3.21 update
    
    Fix build against cmake-3.21: the ninja generator in 3.21 suffers a regression
    (see https://gitlab.kitware.com/cmake/cmake/-/issues/22487) appending an invalid
    "-Wl,--no-as-needed" to the linker arguments for static libraries.
    Once this regression has been fixed upstream, this can be switch back to USES=cmake
    
    PR:             257191
---
 graphics/darktable/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index a8f941c3f508..31051d4f0563 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -31,7 +31,11 @@ LIB_DEPENDS=	libcolord-gtk.so:graphics/colord-gtk \
 		libsoup-2.4.so:devel/libsoup \
 		libtiff.so:graphics/tiff
 
-USES=		cmake compiler:c++14-lang desktop-file-utils gl gnome jpeg \
+# Fix build against cmake-3.21: the ninja generator in 3.21 suffers a regression
+# (see https://gitlab.kitware.com/cmake/cmake/-/issues/22487) appending an invalid
+# "-Wl,--no-as-needed" to the linker arguments for static libraries.
+# Once this regression has been fixed upstream, this can be switch back to USES=cmake
+USES=		cmake:noninja compiler:c++14-lang desktop-file-utils gl gnome jpeg \
 		perl5 pkgconfig shebangfix sqlite tar:xz xorg
 USE_GL=		glu
 USE_GNOME=	cairo gtk30 intltool librsvg2 libxml2


More information about the dev-commits-ports-main mailing list