revert previous addition of BUILDLINK_TRANSFORM as it causes
problem with libusb-compat which includes this file but provides libusb-0.1
This commit is contained in:
parent
b927d16c68
commit
885031a8e4
2 changed files with 3 additions and 6 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue