diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2016-09-30 19:24:30 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2016-09-30 19:24:30 +0000 |
| commit | 1ee4da6dd1d50ed85cd3a614fc8a30b02f3ccf66 (patch) | |
| tree | 8b44219153a720f367633c8fe248933750735b7d /deskutils | |
| parent | - Update to 3.8.82 (diff) | |
Let USES=localbase add -L${LOCALBASE}/lib to LIBS instead of LDFLAGS.
USES=localbase:ldflags can be used to set LDFLAGS. Normally LDFLAGS
appears too early on the command line causing some ports to link with
their own libraries in LOCALBASE (if installed) instead of WRKSRC.
Also make use of _USES_POST so -L${LOCALBASE}/lib is added as late as
possible after anything a port Makefile might set. Use _USES_POST
instead of .include in libedit.mk and libarchive.mk so things like
'USES=libedit localbase:ldflags' work correctly.
Fix some issues with LIBS in some ports.
Switch ports that don't support LIBS to localbase:ldflags.
PR: 212987
Exp-run by: antoine
Approved by: portmgr (antoine)
Notes
Notes:
svn path=/head/; revision=423014
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/fbreader/Makefile | 4 | ||||
| -rw-r--r-- | deskutils/owncloudclient/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile index 7790266ee705..54283056a49f 100644 --- a/deskutils/fbreader/Makefile +++ b/deskutils/fbreader/Makefile @@ -46,7 +46,7 @@ GTK2_USE= gnome=gtk20 GTK2_MAKE_ENV= UI_TYPE=gtk QT4_USE= qt4=gui,corelib,imageformats,network,moc_build -QT4_LDFLAGS= -L${QT_LIBDIR} +QT4_LIBS= -L${QT_LIBDIR} QT4_MAKE_ENV= UI_TYPE=qt4 post-patch: @@ -58,7 +58,7 @@ post-patch: @${REINPLACE_CMD} -e 's/-llinebreak/-lunibreak/g' ${WRKSRC}/makefiles/*.mk @${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fbreader/desktop/Makefile @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \ - -e 's,make ,gmake ,' + -e 's,make ,$$(MAKE) ,' -e '/$$(LDFLAGS)/s/$$/ $$(LIBS)/' pre-configure: # This cannot be done in post-patch because build dependencies are installed diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile index 4eb5f330bfc2..9baea6e04c3d 100644 --- a/deskutils/owncloudclient/Makefile +++ b/deskutils/owncloudclient/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libinotify.so:devel/libinotify \ libqt5keychain.so:security/qtkeychain-qt5 -USES= cmake:outsource compiler:c++11-lib gmake iconv localbase \ - pkgconfig sqlite ssl +USES= cmake:outsource compiler:c++11-lib gmake iconv \ + localbase:ldflags pkgconfig sqlite ssl USE_QT5= buildtools_build concurrent core dbus gui linguist_build network \ qmake_build sql webkit widgets xml CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \ |