diff options
| author | richard <richard@pkgsrc.org> | 2015-10-05 04:47:02 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2015-10-05 04:47:02 +0000 |
| commit | 95c57f5d263e205b861f0f9633a7ff043dbb90b1 (patch) | |
| tree | e277f63cce3575b50d9b24f08ad6dcbe1f10aba4 /devel | |
| parent | e5e4ca229bff292fd3a9e7b67a440b8b3db6c38f (diff) | |
| download | pkgsrc-95c57f5d263e205b861f0f9633a7ff043dbb90b1.tar.gz | |
conditionalise libusb for non-SunOS platforms for the time-being, as there is
not yet any working libusb-1.0 implementation for solaris.
No revbump needed since these didn't build on SunOS prior
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libgphoto2/Makefile | 16 | ||||
| -rw-r--r-- | devel/libgphoto2/PLIST.common | 8 | ||||
| -rw-r--r-- | devel/libgphoto2/buildlink3.mk | 4 |
3 files changed, 22 insertions, 6 deletions
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile index bb48612dab1..1c414270515 100644 --- a/devel/libgphoto2/Makefile +++ b/devel/libgphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2015/09/10 00:54:47 dsainty Exp $ +# $NetBSD: Makefile,v 1.64 2015/10/05 04:47:02 richard Exp $ DISTNAME= libgphoto2-2.5.8 PKGREVISION= 1 @@ -23,6 +23,17 @@ PKGCONFIG_OVERRIDE+= libgphoto2.pc.in libgphoto2_port/libgphoto2_port.pc.in .include "../../mk/bsd.prefs.mk" +PLIST_VARS+= libusb + +.if ${OPSYS} == "SunOS" +BUILDLINK_TRANSFORM+= opt:-Wl,--version-script=./libgphoto2_port.ver:-Wl,-M./libgphoto2_port.ver + +SUBST_CLASSES+= mapfile +SUBST_STAGE.mapfile= post-patch +SUBST_FILES.mapfile= libgphoto2_port/libgphoto2_port/libgphoto2_port.ver +SUBST_SED.mapfile= -e '/gpi_gphoto_port_type_map/d' +.endif + # remove symbolic link post-install: rm ${DESTDIR}${PREFIX}/include/gphoto2/gphoto2 @@ -30,7 +41,10 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" +.if ${OPSYS} != "SunOS" +PLIST.libusb= yes .include "../../devel/libusb/buildlink3.mk" +.endif .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/devel/libgphoto2/PLIST.common b/devel/libgphoto2/PLIST.common index e685c43c782..8eddb054c2a 100644 --- a/devel/libgphoto2/PLIST.common +++ b/devel/libgphoto2/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.21 2015/08/23 14:17:05 wiz Exp $ +@comment $NetBSD: PLIST.common,v 1.22 2015/10/05 04:47:02 richard Exp $ bin/gphoto2-config bin/gphoto2-port-config include/gphoto2/gphoto2-abilities-list.h @@ -89,9 +89,9 @@ lib/libgphoto2_port.la lib/libgphoto2_port/0.12.0/disk.la lib/libgphoto2_port/0.12.0/ptpip.la lib/libgphoto2_port/0.12.0/serial.la -lib/libgphoto2_port/0.12.0/usb.la -lib/libgphoto2_port/0.12.0/usbdiskdirect.la -lib/libgphoto2_port/0.12.0/usbscsi.la +${PLIST.libusb}lib/libgphoto2_port/0.12.0/usb.la +${PLIST.libusb}lib/libgphoto2_port/0.12.0/usbdiskdirect.la +${PLIST.libusb}lib/libgphoto2_port/0.12.0/usbscsi.la lib/pkgconfig/libgphoto2.pc lib/pkgconfig/libgphoto2_port.pc man/man3/libgphoto2.3 diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk index c16b2c2a425..2f0f3e29016 100644 --- a/devel/libgphoto2/buildlink3.mk +++ b/devel/libgphoto2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2015/09/10 00:54:47 dsainty Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2015/10/05 04:47:02 richard Exp $ BUILDLINK_TREE+= libgphoto2 @@ -10,7 +10,9 @@ BUILDLINK_ABI_DEPENDS.libgphoto2+= libgphoto2>=2.4.7nb3 BUILDLINK_PKGSRCDIR.libgphoto2?= ../../devel/libgphoto2 .include "../../mk/bsd.fast.prefs.mk" +.if ${OPSYS} != "SunOS" .include "../../devel/libusb/buildlink3.mk" +.endif .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" |