pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/cairo graphics/cairo: make symbol lookup feat...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d81db81115ff
branches:  trunk
changeset: 450986:d81db81115ff
user:      thor <thor%pkgsrc.org@localhost>
date:      Fri Apr 23 16:56:21 2021 +0000

description:
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.

diffstat:

 graphics/cairo/Makefile   |   4 ++--
 graphics/cairo/options.mk |  13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 0c5fce3eed79 -r d81db81115ff graphics/cairo/Makefile
--- a/graphics/cairo/Makefile   Fri Apr 23 16:41:34 2021 +0000
+++ b/graphics/cairo/Makefile   Fri Apr 23 16:56:21 2021 +0000
@@ -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
 
diff -r 0c5fce3eed79 -r d81db81115ff graphics/cairo/options.mk
--- a/graphics/cairo/options.mk Fri Apr 23 16:41:34 2021 +0000
+++ b/graphics/cairo/options.mk Fri Apr 23 16:56:21 2021 +0000
@@ -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-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
+



Home | Main Index | Thread Index | Old Index