eabab5c Reorder libs for static link. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Reorder libs for static link.

Vsevolod Stakhov committed 12 years ago

commit eabab5cfab5cd0b5df4995335182282fc2d7e7f0
parent 08d3838

3 files changed +19 -20

modified configure.ac

@@ -82,6 +82,7 @@ AC_SEARCH_LIBS([zlibVersion], [z], [], [

 AC_SEARCH_LIBS([archive_read_open], [archive], [], [
   AC_MSG_ERROR([unable to find the archive_read() function])
 ])
 AC_CHECK_HEADER([archive.h],
 	[pkg_found_archive_headers=yes])
 AS_IF([test "x$pkg_found_archive_headers" != "xyes"],

modified libpkg/Makefile.am

@@ -48,14 +48,10 @@ libpkg_la_LIBADD= $(top_builddir)/external/libucl.la \

 			@LIBELF_LIB@ \
 			@LIBSBUF_LIB@ \
 			-larchive \
 			-lsbuf \
 			-lfetch \
 			-lutil \
 			-lssl \
 			-lcrypto \
 			-lbz2 \
 			-lz \
 			-llzma
 			-lcrypto
 libpkg_la_LDFLAGS=	-version-info 2 -pthread
 lib_LTLIBRARIES=	libpkg.la libpkg_static.la
 include_HEADERS=	pkg.h

@@ -64,18 +60,8 @@ libpkg_static_la_SOURCES= $(libpkg_la_SOURCES)

 libpkg_static_la_CFLAGS=	$(pkg_common_cflags) -static
 libpkg_static_la_LIBADD=	$(top_builddir)/external/libucl_static.la \
 			$(top_builddir)/external/libsqlite_static.la \
 			$(top_builddir)/external/libyaml_static.la \
 			@LIBELF_LIB@ \
 			@LIBSBUF_LIB@ \
 			-larchive \
 			-lsbuf \
 			-lfetch \
 			-lutil \
 			-lssl \
 			-lcrypto \
 			-lbz2 \
 			-lz \
 			-llzma
 			$(top_builddir)/external/libyaml_static.la
 libpkg_static_la_LDFLAGS=	-all-static
 noinst_HEADERS=		private/db_upgrades.h \

modified src/Makefile.am

@@ -79,8 +79,20 @@ pkg_static_CFLAGS= $(pkg_CFLAGS)

 pkg_static_SOURCES=	$(pkg_SOURCES)
 pkg_static_LDADD=	$(top_builddir)/libpkg/libpkg_static.la \
 			$(top_builddir)/external/libexpat_static.la \
 			@LIBJAIL_LIB@
 pkg_static_LDFLAGS=	-all-static -static-libtool-libs -pthread
 			@LIBJAIL_LIB@ \
 			@LIBSBUF_LIB@ \
 			@LIBELF_LIB@ \
 			-lfetch \
 			-larchive \
 			-lz \
 			-lutil \
 			-lsbuf \
 			-lbz2 \
 			-llzma \
 			-lssl \
 			-lcrypto \
 			-lmd
 pkg_static_LDFLAGS=	-all-static -pthread
 sbin_PROGRAMS=		pkg pkg-static
 dist_sysconf_DATA=	pkg.conf.sample