From 2912d6aa5c87ea0217975b3ce2cb6e25b855ebc8 Mon Sep 17 00:00:00 2001 From: brook Date: Mon, 24 Feb 2020 17:37:27 +0000 Subject: [PATCH] Fix build breakage on Darwin. MacOS uses the .dylib extension for shared libraries and dyld does not understand the --version-script option. --- graphics/babl/Makefile | 15 +++++++++- graphics/babl/PLIST | 65 +++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 33 deletions(-) diff --git a/graphics/babl/Makefile b/graphics/babl/Makefile index ef96aff8c82f..1ba37f6ee376 100644 --- a/graphics/babl/Makefile +++ b/graphics/babl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2020/01/19 23:19:50 nia Exp $ +# $NetBSD: Makefile,v 1.30 2020/02/24 17:37:27 brook Exp $ DISTNAME= babl-0.1.72 CATEGORIES= graphics @@ -20,7 +20,20 @@ PKGCONFIG_OVERRIDE+= babl.pc.in PYTHON_FOR_BUILD_ONLY= tool +.include "../../mk/bsd.prefs.mk" + +PLIST_VARS+= Darwin not_Darwin +.if ${OPSYS} == "Darwin" +PLIST.Darwin= yes +PLIST_SUBST+= SOEXT="dylib" +.else +PLIST.not_Darwin= yes +PLIST_SUBST+= SOEXT="so" +.endif + # Apply removals to post-wrapper transformed arguments. +BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,--version-script +BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,babl.map BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,babl.map diff --git a/graphics/babl/PLIST b/graphics/babl/PLIST index 635a4a4a26aa..3802cc588fb4 100644 --- a/graphics/babl/PLIST +++ b/graphics/babl/PLIST @@ -1,38 +1,39 @@ -@comment $NetBSD: PLIST,v 1.10 2019/11/02 14:05:08 nia Exp $ +@comment $NetBSD: PLIST,v 1.11 2020/02/24 17:37:27 brook Exp $ include/babl-0.1/babl/babl-introspect.h include/babl-0.1/babl/babl-macros.h include/babl-0.1/babl/babl-types.h include/babl-0.1/babl/babl-version.h include/babl-0.1/babl/babl.h -lib/babl-0.1/CIE.so -lib/babl-0.1/HCY.so -lib/babl-0.1/HSL.so -lib/babl-0.1/HSV.so -lib/babl-0.1/avx2-int8.so -lib/babl-0.1/cairo.so -lib/babl-0.1/double.so -lib/babl-0.1/fast-float.so -lib/babl-0.1/float.so -lib/babl-0.1/gegl-fixups.so -lib/babl-0.1/gggl-lies.so -lib/babl-0.1/gggl-table-lies.so -lib/babl-0.1/gggl-table.so -lib/babl-0.1/gggl.so -lib/babl-0.1/gimp-8bit.so -lib/babl-0.1/grey.so -lib/babl-0.1/half.so -lib/babl-0.1/naive-CMYK.so -lib/babl-0.1/simple.so -lib/babl-0.1/sse-half.so -lib/babl-0.1/sse2-float.so -lib/babl-0.1/sse2-int16.so -lib/babl-0.1/sse2-int8.so -lib/babl-0.1/sse4-int8.so -lib/babl-0.1/two-table.so -lib/babl-0.1/u16.so -lib/babl-0.1/u32.so -lib/babl-0.1/ycbcr.so -lib/libbabl-0.1.so -lib/libbabl-0.1.so.0 -lib/libbabl-0.1.so.0.171.1 +lib/babl-0.1/CIE.${SOEXT} +lib/babl-0.1/HCY.${SOEXT} +lib/babl-0.1/HSL.${SOEXT} +lib/babl-0.1/HSV.${SOEXT} +lib/babl-0.1/avx2-int8.${SOEXT} +lib/babl-0.1/cairo.${SOEXT} +lib/babl-0.1/double.${SOEXT} +lib/babl-0.1/fast-float.${SOEXT} +lib/babl-0.1/float.${SOEXT} +lib/babl-0.1/gegl-fixups.${SOEXT} +lib/babl-0.1/gggl-lies.${SOEXT} +lib/babl-0.1/gggl-table-lies.${SOEXT} +lib/babl-0.1/gggl-table.${SOEXT} +lib/babl-0.1/gggl.${SOEXT} +lib/babl-0.1/gimp-8bit.${SOEXT} +lib/babl-0.1/grey.${SOEXT} +lib/babl-0.1/half.${SOEXT} +lib/babl-0.1/naive-CMYK.${SOEXT} +lib/babl-0.1/simple.${SOEXT} +lib/babl-0.1/sse-half.${SOEXT} +lib/babl-0.1/sse2-float.${SOEXT} +lib/babl-0.1/sse2-int16.${SOEXT} +lib/babl-0.1/sse2-int8.${SOEXT} +lib/babl-0.1/sse4-int8.${SOEXT} +lib/babl-0.1/two-table.${SOEXT} +lib/babl-0.1/u16.${SOEXT} +lib/babl-0.1/u32.${SOEXT} +lib/babl-0.1/ycbcr.${SOEXT} +lib/libbabl-0.1.${SOEXT} +${PLIST.Darwin}lib/libbabl-0.1.0.${SOEXT} +${PLIST.not_Darwin}lib/libbabl-0.1.${SOEXT}.0 +${PLIST.not_Darwin}lib/libbabl-0.1.${SOEXT}.0.171.1 lib/pkgconfig/babl.pc