Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 2b542f8
Stop building pkg-static on linux.
Vsevolod Stakhov committed 11 years ago
commit 2b542f85c55b0f95701087030a5fe6f626449047
parent 73c734d
2 files changed +15 -2
modified configure.ac
@@ -75,18 +75,22 @@ case $host_os in
  linux*)

        OS_CFLAGS="-pthread"

        OS_LDFLAGS="-pthread"
- 
        OS_LIBS="-ldl -lrt -llzo2 -llzma"
+ 
        OS_LIBS="-ldl -lrt"
+ 
        OS_STATIC="false"

        ;;

    *)

        OS_CFLAGS=

        OS_LDFLAGS=

        OS_LIBS=
+ 
        OS_STATIC="true"

        ;;

esac



AC_SUBST(OS_CFLAGS)

AC_SUBST(OS_LDFLAGS)

AC_SUBST(OS_LIBS)
+ 
AC_SUBST(OS_STATIC)
+ 
AM_CONDITIONAL([BUILD_STATIC], [test x$OS_STATIC = xtrue])



AC_CHECK_HEADERS_ONCE([machine/endian.h])

AC_CHECK_HEADERS_ONCE([endian.h])
modified src/Makefile.am
@@ -83,11 +83,20 @@ pkg_static_LDADD+= $(top_builddir)/external/libmachista_static.la \
pkg_LDADD+=		-lresolv

endif
- 
pkg_static_LDFLAGS=	-all-static

DYNPROG=		pkg
+
+ 
if BUILD_STATIC
+
+ 
pkg_static_LDFLAGS=	-all-static

sbin_PROGRAMS=		pkg-static
+ 


if DYNAMIC

sbin_PROGRAMS+=		$(DYNPROG)

endif
+ 
else
+
+ 
sbin_PROGRAMS=	$(DYNPROG)
+ 
endif
+ 


dist_sysconf_DATA=	pkg.conf.sample