diff options
| author | plunky <plunky@pkgsrc.org> | 2020-05-25 06:47:40 +0000 |
|---|---|---|
| committer | plunky <plunky@pkgsrc.org> | 2020-05-25 06:47:40 +0000 |
| commit | 97649b9972c8989d8b84737d43685e5ef190b379 (patch) | |
| tree | 49f995e4b618ea24d4f09bbef0878832e5e20b86 /devel | |
| parent | 382f1a133f73ac605149291a0c0eb2460682e19d (diff) | |
| download | pkgsrc-97649b9972c8989d8b84737d43685e5ef190b379.tar.gz | |
revert previous addition of BUILDLINK_TRANSFORM as it causes
problem with libusb-compat which includes this file but provides
libusb-0.1
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libusb1/buildlink3.mk | 5 | ||||
| -rw-r--r-- | devel/libusb1/builtin.mk | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/devel/libusb1/buildlink3.mk b/devel/libusb1/buildlink3.mk index b3b69ce7722..924a770b19e 100644 --- a/devel/libusb1/buildlink3.mk +++ b/devel/libusb1/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2020/05/22 08:31:39 plunky Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2020/05/25 06:47:40 plunky Exp $ BUILDLINK_TREE+= libusb1 @@ -7,9 +7,6 @@ LIBUSB1_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libusb1+= libusb1>=1.0.9 BUILDLINK_PKGSRCDIR.libusb1?= ../../devel/libusb1 - -BUILDLINK_INCDIRS.libusb1+= include/libusb-1.0 -BUILDLINK_TRANSFORM+= l:usb:usb-1.0 .endif # LIBUSB1_BUILDLINK3_MK BUILDLINK_TREE+= -libusb1 diff --git a/devel/libusb1/builtin.mk b/devel/libusb1/builtin.mk index aa94d62954d..e77091bd984 100644 --- a/devel/libusb1/builtin.mk +++ b/devel/libusb1/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2019/11/03 10:39:18 rillig Exp $ +# $NetBSD: builtin.mk,v 1.4 2020/05/25 06:47:40 plunky Exp $ BUILTIN_PKG:= libusb1 @@ -42,7 +42,7 @@ override-libusb-pkgconfig: ${ECHO} "Name: libusb-1.0"; \ ${ECHO} "Description: library for USB access"; \ ${ECHO} "Version: ${BUILTIN_VERSION.libusb1}"; \ - ${ECHO} "Libs: -Wl,-R\$${libdir} -L\$${libdir} -lusb"; \ + ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -lusb"; \ ${ECHO} "Cflags: -I\$${includedir}"; \ } >> ${BLKDIR_PKGCFG}/${LIBUSB_PKGCFGF}; . endif |