CVS commit: pkgsrc/graphics/cairo

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Fri Apr 23 16:56:21 UTC 2021

Modified Files:
        pkgsrc/graphics/cairo: Makefile options.mk

Log Message:
graphics/cairo: make symbol lookup feature optional, avoiding libbfd

If cairo finds libbfd, it would use it unless symbol lookup was not
requested. This dependency is problematic as the binutils library
does not provide long-term ABI stability. We can live fine without this
feature and reduce the dependency footprint.


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 pkgsrc/graphics/cairo/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/cairo/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/cairo/Makefile
diff -u pkgsrc/graphics/cairo/Makefile:1.147 pkgsrc/graphics/cairo/Makefile:1.148
--- pkgsrc/graphics/cairo/Makefile:1.147        Mon Aug 17 20:17:27 2020
+++ pkgsrc/graphics/cairo/Makefile      Fri Apr 23 16:56:21 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.147 2020/08/17 20:17:27 leot Exp $
+# $NetBSD: Makefile,v 1.148 2021/04/23 16:56:21 thor Exp $
 
 .include "../../graphics/cairo/Makefile.common"
 
-PKGREVISION=   2
+PKGREVISION=   3
 
 TEST_TARGET=                   check
 

Index: pkgsrc/graphics/cairo/options.mk
diff -u pkgsrc/graphics/cairo/options.mk:1.19 pkgsrc/graphics/cairo/options.mk:1.20
--- pkgsrc/graphics/cairo/options.mk:1.19       Sat Nov  2 22:37:54 2019
+++ pkgsrc/graphics/cairo/options.mk    Fri Apr 23 16:56:21 2021
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.19 2019/11/02 22:37:54 rillig Exp $
+# $NetBSD: options.mk,v 1.20 2021/04/23 16:56:21 thor Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cairo
-PKG_SUPPORTED_OPTIONS= x11 xcb
+PKG_SUPPORTED_OPTIONS= x11 xcb bfd
 .if exists(/System/Library/Frameworks/Quartz.framework)
 PKG_SUPPORTED_OPTIONS+=        quartz
 .endif
@@ -57,3 +57,12 @@ CONFIGURE_ARGS+=     --disable-quartz
 CONFIGURE_ARGS+=       --disable-quartz-font
 CONFIGURE_ARGS+=       --disable-quartz-image
 .endif
+
+# The symbol lookup feature uses libbfd from binutils, which
+# is rather fragile when they decide to change the API again.
+.if !empty(PKG_OPTIONS:Mbfd)
+CONFIGURE_ARGS+=       --enable-symbol-lookup
+.else
+CONFIGURE_ARGS+=       --disable-symbol-lookup
+.endif
+