diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-08-21 14:03:45 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-08-21 14:03:45 +0000 |
| commit | 287c11c502dc4b4b30d85d61ebdb24cfaae90403 (patch) | |
| tree | 8bdfc458fedd77e67f5bc6e12dbddc63f7997361 /devel | |
| parent | 6baba0d320187636d0237f76871b5e31f510539f (diff) | |
| download | pkgsrc-287c11c502dc4b4b30d85d61ebdb24cfaae90403.tar.gz | |
Pull in devel/libusb on SunOS instead of the unsupported devel/libusb1, the
package detects which version is used at build time and handles both.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libmtp/Makefile | 9 | ||||
| -rw-r--r-- | devel/libmtp/buildlink3.mk | 9 |
2 files changed, 15 insertions, 3 deletions
diff --git a/devel/libmtp/Makefile b/devel/libmtp/Makefile index 427f8f9805d..09a45c923b8 100644 --- a/devel/libmtp/Makefile +++ b/devel/libmtp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/04/08 09:52:01 markd Exp $ +# $NetBSD: Makefile,v 1.9 2014/08/21 14:03:45 jperkin Exp $ # DISTNAME= libmtp-1.1.6 @@ -20,10 +20,15 @@ PKGCONFIG_OVERRIDE+= libmtp.pc.in REPLACE_SH= hotplug.sh.in REPLACE_SH+= libmtp.sh.in -# XXX ? LDFLAGS.FreeBSD+= -liconv LDFLAGS.SunOS= -liconv +.include "../../mk/bsd.prefs.mk" + .include "../../converters/libiconv/buildlink3.mk" +.if ${OPSYS} == "SunOS" +.include "../../devel/libusb/buildlink3.mk" +.else .include "../../devel/libusb1/buildlink3.mk" +.endif .include "../../mk/bsd.pkg.mk" diff --git a/devel/libmtp/buildlink3.mk b/devel/libmtp/buildlink3.mk index c005f176578..cd71487f787 100644 --- a/devel/libmtp/buildlink3.mk +++ b/devel/libmtp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2012/08/14 21:00:46 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2014/08/21 14:03:45 jperkin Exp $ BUILDLINK_TREE+= libmtp @@ -8,7 +8,14 @@ LIBMTP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libmtp+= libmtp>=0.3.0 BUILDLINK_PKGSRCDIR.libmtp?= ../../devel/libmtp +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} == "SunOS" +.include "../../devel/libusb/buildlink3.mk" +.else .include "../../devel/libusb1/buildlink3.mk" +.endif + .endif # LIBMTP_BUILDLINK3_MK BUILDLINK_TREE+= -libmtp |