Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/libusb1 revert previous addition of BUILDLINK_TR...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7934a76c24bc
branches:  trunk
changeset: 432733:7934a76c24bc
user:      plunky <plunky%pkgsrc.org@localhost>
date:      Mon May 25 06:47:40 2020 +0000

description:
revert previous addition of BUILDLINK_TRANSFORM as it causes
problem with libusb-compat which includes this file but provides
libusb-0.1

diffstat:

 devel/libusb1/buildlink3.mk |  5 +----
 devel/libusb1/builtin.mk    |  4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 734af0996932 -r 7934a76c24bc devel/libusb1/buildlink3.mk
--- a/devel/libusb1/buildlink3.mk       Mon May 25 05:58:40 2020 +0000
+++ b/devel/libusb1/buildlink3.mk       Mon May 25 06:47:40 2020 +0000
@@ -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 @@
 
 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 -r 734af0996932 -r 7934a76c24bc devel/libusb1/builtin.mk
--- a/devel/libusb1/builtin.mk  Mon May 25 05:58:40 2020 +0000
+++ b/devel/libusb1/builtin.mk  Mon May 25 06:47:40 2020 +0000
@@ -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 @@
        ${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



Home | Main Index | Thread Index | Old Index