link with libusb-1.0 and not libusb; fixes build with lld

tested by and ok bentley@ (MAINTAINER)
This commit is contained in:
jasper 2018-05-17 09:55:46 +00:00
parent ca1356a332
commit ca4aa24bdb
2 changed files with 23 additions and 3 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2018/04/27 08:16:13 bentley Exp $
# $OpenBSD: Makefile,v 1.10 2018/05/17 09:55:46 jasper Exp $
COMMENT = generic multi-emulator frontend
V = 1.7.2
REVISION = 0
DISTNAME = retroarch-$V
CATEGORIES = emulators
@ -16,7 +17,7 @@ WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += EGL GL SDL2 X11 X11-xcb Xext Xinerama Xv Xxf86vm ass
WANTLIB += avcodec avformat avutil c drm freetype gbm m openal
WANTLIB += pthread swresample swscale usb-1.0 xcb xkbcommon
WANTLIB += z usb
WANTLIB += z
GH_ACCOUNT = libretro
GH_PROJECT = RetroArch
@ -27,7 +28,6 @@ MAINTAINER = Anthony J. Bentley <anthony@anjbe.name>
RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS = audio/openal \
devel/libusb1 \
devel/libusb-compat \
devel/sdl2 \
graphics/ffmpeg \
x11/xkbcommon

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-Makefile_common,v 1.1 2018/05/17 09:55:46 jasper Exp $
Explicitly link with libusb-1.0
Index: Makefile.common
--- Makefile.common.orig
+++ Makefile.common
@@ -952,11 +952,7 @@ ifeq ($(HAVE_THREADS), 1)
ifeq ($(HAVE_HID), 1)
DEFINES += -DHAVE_LIBUSB
OBJ += input/drivers_hid/libusb_hid.o
- ifneq ($(findstring BSD,$(OS)),)
- LIBS += -lusb
- else
- LIBS += -lusb-1.0
- endif
+ LIBS += -lusb-1.0
endif
endif
endif