mirror of https://github.com/tstack/lnav.git
[release] some static link cleanup
This commit is contained in:
parent
3041dca1ed
commit
22ad9f23a9
|
@ -1,6 +1,6 @@
|
|||
|
||||
# aminclude_static.am generated automatically by Autoconf
|
||||
# from AX_AM_MACROS_STATIC on Sun May 30 13:10:25 PDT 2021
|
||||
# from AX_AM_MACROS_STATIC on Sun Jun 13 22:52:26 PDT 2021
|
||||
|
||||
|
||||
# Code coverage
|
||||
|
|
|
@ -182,7 +182,7 @@ dnl esac
|
|||
|
||||
AC_DEFINE([_XOPEN_SOURCE_EXTENDED], [1], [Wide character support for ncurses])
|
||||
|
||||
AS_VAR_SET(ALL_LDFLAGS, "$SQLITE3_LDFLAGS $READLINE_LDFLAGS $LDFLAGS")
|
||||
AS_VAR_SET(ALL_LDFLAGS, "$SQLITE3_LDFLAGS $READLINE_LDFLAGS $LIBARCHIVE_LDFLAGS $LIBCURL $LDFLAGS")
|
||||
|
||||
AS_VAR_SET(static_lib_list,
|
||||
["libncurses.a libncursesw.a libreadline.a libsqlite3.a libz.a libtinfo.a libtinfow.a"])
|
||||
|
@ -191,7 +191,11 @@ AS_VAR_SET(static_lib_list,
|
|||
AS_VAR_SET(static_lib_list,
|
||||
["$static_lib_list libgpm.a libcurl.a libcrypto.a libssl.a libssh2.a"])
|
||||
AS_VAR_SET(static_lib_list,
|
||||
["$static_lib_list libarchive.a"])
|
||||
["$static_lib_list libnghttp2.a liblzma.a libcrypto.a libzstd.a libldap.a"])
|
||||
AS_VAR_SET(static_lib_list,
|
||||
["$static_lib_list libarchive.a libidn2.a libgssapi_krb5.a libbrotlidec-static.a"])
|
||||
AS_VAR_SET(static_lib_list,
|
||||
["$static_lib_list librtmp.a libiconv.a liblz4.a liblber.a libunistring.a"])
|
||||
|
||||
if test x"${enable_static}" = x"yes"; then
|
||||
case "$host_os" in
|
||||
|
|
|
@ -40,27 +40,9 @@ else
|
|||
AC_MSG_RESULT([(testing)])
|
||||
AC_CHECK_LIB(pcre, pcre_study)
|
||||
AS_VAR_SET(saved_LIBS, $LIBS)
|
||||
AS_VAR_SET(LIBS, "-lpcrecpp $LIBS")
|
||||
AC_MSG_CHECKING([libpcrecpp])
|
||||
AC_LANG_PUSH([C++])
|
||||
AC_LINK_IFELSE(
|
||||
[
|
||||
AC_LANG_PROGRAM([[@%:@include <pcrecpp.h>]],
|
||||
[[
|
||||
pcrecpp::RE("hello");
|
||||
]]
|
||||
)
|
||||
],
|
||||
AC_MSG_RESULT([yes]),
|
||||
[
|
||||
AC_MSG_RESULT([[no, (WARNING)]])
|
||||
AS_VAR_SET(LIBS, $saved_LIBS)
|
||||
]
|
||||
)
|
||||
AC_LANG_POP([C++])
|
||||
AC_CHECK_HEADERS(pcre.h pcre/pcre.h)
|
||||
if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then
|
||||
PCRE_LIBS="-lpcre -lpcrecpp"
|
||||
PCRE_LIBS="-lpcre"
|
||||
AC_MSG_CHECKING([lib pcre])
|
||||
AC_MSG_RESULT([$PCRE_LIBS])
|
||||
m4_ifval($1,$1)
|
||||
|
@ -73,7 +55,7 @@ else
|
|||
if test "$ac_cv_lib_pcre_pcre_compile" = "yes" ; then
|
||||
AC_MSG_RESULT(.setting PCRE_LIBS -L$with_pcre/lib -lpcre)
|
||||
PCRE_LDFLAGS="-L$with_pcre/lib"
|
||||
PCRE_LIBS="-lpcre -lpcrecpp"
|
||||
PCRE_LIBS="-lpcre"
|
||||
test -d "$with_pcre/include" && PCRE_CFLAGS="-I$with_pcre/include"
|
||||
AC_MSG_CHECKING([lib pcre])
|
||||
AC_MSG_RESULT([$PCRE_LIBS])
|
||||
|
|
|
@ -55,7 +55,16 @@ osx-build:
|
|||
rm -rf osx-build-dir
|
||||
mkdir -p osx-build-dir
|
||||
cd ../ && ./autogen.sh
|
||||
cd osx-build-dir && ../../configure --with-readline=/usr/local/opt/readline CXXFLAGS=-I/usr/local/opt/ncurses/include LDFLAGS=-L/usr/local/opt/ncurses/lib && make -j8 && make dist -j8 && make dist-bzip2
|
||||
cd osx-build-dir && \
|
||||
../../configure --enable-static \
|
||||
--with-readline=/usr/local/opt/readline \
|
||||
--with-sqlite3=/usr/local/opt/sqlite \
|
||||
--with-libarchive=/usr/local/opt/libarchive \
|
||||
"CXXFLAGS=-I/usr/local/opt/ncurses/include -g1 -O2" \
|
||||
"CFLAGS=-I/usr/local/opt/ncurses/include -g1 -O2" \
|
||||
"LDFLAGS=-L/usr/local/opt/ncurses/lib -L/usr/local/opt/xz/lib" \
|
||||
"LIBS=-llzma -lzstd -lbrotlidec-static -liconv -llz4" \
|
||||
&& make -j8 && make dist -j8 && make dist-bzip2
|
||||
|
||||
osx-package: clean-outbox osx-build
|
||||
mkdir -p osx-pkg/lnav-${VERSION}
|
||||
|
|
Loading…
Reference in New Issue