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 /net/ocserv/files/patch-configure.ac | |
| 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 'net/ocserv/files/patch-configure.ac')
| -rw-r--r-- | net/ocserv/files/patch-configure.ac | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/net/ocserv/files/patch-configure.ac b/net/ocserv/files/patch-configure.ac index 227dbaa1ea0b..846343d44be6 100644 --- a/net/ocserv/files/patch-configure.ac +++ b/net/ocserv/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2015-09-04 19:27:22 UTC +--- configure.ac.orig 2016-08-04 06:12:29 UTC +++ configure.ac @@ -19,7 +19,7 @@ if [ test "$GCC" = "yes" ];then fi @@ -7,9 +7,9 @@ -AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [:]) +AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [autogen]) - if test x"$AUTOGEN" = "x:"; then - AC_MSG_WARN([[ -@@ -125,7 +125,7 @@ if test "$test_for_libnl" = yes;then + AX_CODE_COVERAGE + +@@ -133,7 +133,7 @@ if test "$test_for_libnl" = yes;then fi have_readline=no @@ -18,7 +18,15 @@ #include <stdio.h> #include <readline/readline.h>], [rl_replace_line(0,0);]) if test x$ac_cv_libreadline = xyes; then -@@ -442,7 +442,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";the +@@ -183,6 +183,7 @@ AC_ARG_WITH(pam, + + pam_enabled=no + ++oldlibs=$LIBS + if test "$test_for_pam" = yes;then + LIBS="$oldlibs -lpam" + AC_MSG_CHECKING([for pam library]) +@@ -496,7 +497,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";the cp -f $i $nam fi done |