cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpsbabel: fix packaging on base-gcc archs.

Browse Source 
Implicit MODGCC4_CPPLIBDEP in LIB_DEPENDS is not inherited by
LIB_DEPENDS-*, despite COMPILER_LIBCXX being in WANTLIB-*.

With hints from kirby@, thanks!

OK sthen@
This commit is contained in:
cwen 2019-10-16 18:59:54 +00:00
parent 61c6e8bd31
commit 3c720aa050
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
geo/gpsbabel/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2019/09/03 13:48:25 uaa Exp $
# $OpenBSD: Makefile,v 1.36 2019/10/16 18:59:54 cwen Exp $
COMMENT-main= GPS waypoint, track, and route conversion tool
COMMENT-tk= Tk front-end to gpsbabel
@ -12,6 +12,8 @@ DISTNAME= gpsbabel-${VERSION}
PKGNAME-main= gpsbabel-${VERSION}
PKGNAME-tk= gpsbabel-tk-${VERSION}
PKGNAME-qt= gpsbabel-qt-${VERSION}
REVISION-main= 0
REVISION-qt= 0
CATEGORIES= geo
HOMEPAGE= https://www.gpsbabel.org/
@ -34,7 +36,8 @@ MULTI_PACKAGES= -main -tk -qt
MODULES= devel/qmake x11/tk x11/qt5
MODQMAKE_PROJECTS = gui/app.pro
LIB_DEPENDS-main= devel/libusb-compat \
LIB_DEPENDS-main= ${MODGCC4_CPPLIBDEP} \
devel/libusb-compat \
devel/shapelib
cWANTLIB = c m pthread
@ -44,7 +47,8 @@ WANTLIB-qt += GL Qt5Core Qt5Gui Qt5Network Qt5WebKit Qt5WebKitWidgets
WANTLIB-qt += Qt5Widgets Qt5Xml ${COMPILER_LIBCXX} ${cWANTLIB}
LIB_DEPENDS-tk=
LIB_DEPENDS-qt= x11/qt5/qtwebkit
LIB_DEPENDS-qt= ${MODGCC4_CPPLIBDEP} \
x11/qt5/qtwebkit
PKG_ARCH-tk= *
RUN_DEPENDS-tk= geo/gpsbabel \
${MODTK_RUN_DEPENDS}