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 /archivers | |
| 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 'archivers')
| -rw-r--r-- | archivers/pigz/Makefile | 2 | ||||
| -rw-r--r-- | archivers/unmakeself/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/archivers/pigz/Makefile b/archivers/pigz/Makefile index d34411e94141..96a4f3789275 100644 --- a/archivers/pigz/Makefile +++ b/archivers/pigz/Makefile @@ -15,7 +15,7 @@ LICENSE= ZLIB LIB_DEPENDS= libzopfli.so:archivers/zopfli -USES= cpe gmake localbase +USES= cpe gmake localbase:ldflags CPE_VENDOR= zlib ALL_TARGET= dev MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/archivers/unmakeself/Makefile b/archivers/unmakeself/Makefile index 98952399c121..f06ad9e72474 100644 --- a/archivers/unmakeself/Makefile +++ b/archivers/unmakeself/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Extract Makeself archives USES= libarchive -LDFLAGS+= -larchive +LIBS+= -larchive NO_WRKSUBDIR= yes PLIST_FILES= bin/unmakeself @@ -26,7 +26,7 @@ do-configure: do-build: ${CC} ${CFLAGS} ${CPPFLAGS} -I${WRKSRC} -o ${WRKSRC}/unmakeself \ - ${FILESDIR}/unmakeself.c ${LDFLAGS} + ${FILESDIR}/unmakeself.c ${LDFLAGS} ${LIBS} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unmakeself ${STAGEDIR}/${PREFIX}/bin |