From ab76f9d5e77a613c10a6ca415d088fbf14c10f26 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 31 Mar 2010 12:50:31 +0200 Subject: [PATCH] Use pkg-config to find out the openssl/libarchive required static libs. --HG-- extra : convert_revision : xtraeme%40gmail.com-20100331105031-rgq5aux38pptti6j --- README | 5 ++--- vars.mk | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index a4ef021d..d4985224 100644 --- a/README +++ b/README @@ -2,10 +2,9 @@ See http://xbps.nopcode.org/ for information. To build this you'll need: + - pkg-config - openssl (development package with static libs) - - libarchive (development package with static libs, and all features - built in: acl/attr, xz, bzip2 and zlib are REQUIRED to build the - static binaries!) + - libarchive (development package with static libs) - proplib (development package with static lib), available at http://code.google.com/p/portableproplib - asciidoc (to build the manpages) diff --git a/vars.mk b/vars.mk index 897132ac..634c084e 100644 --- a/vars.mk +++ b/vars.mk @@ -29,5 +29,6 @@ CFLAGS = $(DEBUG_FLAGS) $(WARNFLAGS) -fPIC -DPIC -fstack-protector-all SHAREDLIB_CFLAGS = -fvisibility=default # Grr, hate the static libs! -STATIC_LIBS = -lprop -lpthread -larchive -lssl -lcrypto -ldl -lacl -STATIC_LIBS += -lattr -llzma -lbz2 -lz +STATIC_LIBS = -lprop -lpthread +STATIC_LIBS += `pkg-config openssl --libs --static` +STATIC_LIBS += `pkg-config libarchive --libs --static`