Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 37bd451
Some ugly split for shared/static builds.
Vsevolod Stakhov committed 12 years ago
commit 37bd4519028adbf236d25b51dde875e7b6ae0c9d
parent 0eb4726
3 files changed +39 -4
modified external/Makefile.am
@@ -57,7 +57,11 @@ noinst_HEADERS= expat/amiga/expat_68k.h \


EXTRA_LTLIBRARIES=	libelf.la
- 
noinst_LTLIBRARIES=	libucl.la libucl_static.la libsqlite.la libyaml.la libexpat.la @LIBELF_BUNDLED@
+ 
noinst_LTLIBRARIES=	libucl.la libucl_static.la \
+ 
					libsqlite.la libsqlite_static.la \
+ 
					libyaml.la libyaml_static.la \
+ 
					libexpat.la libexpat_static.la \
+ 
					@LIBELF_BUNDLED@



libelf_la_SOURCES=	libelf/elf.c \

			libelf/elf_begin.c \
@@ -131,11 +135,16 @@ libucl_la_CFLAGS= -I$(top_srcdir)/external//libucl/uthash \
libucl_static_la_SOURCES=	$(libucl_la_SOURCES)

libucl_static_la_CFLAGS=	$(libucl_la_CFLAGS)

libucl_static_la_LDFLAGS=	-all-static
+ 


libexpat_la_SOURCES=	expat/lib/xmlparse.c \

			expat/lib/xmlrole.c \

			expat/lib/xmltok.c

libexpat_la_CFLAGS=	-I$(top_srcdir)/external/expat \

			-DHAVE_EXPAT_CONFIG_H
+ 
libexpat_static_la_SOURCES=	$(libexpat_la_SOURCES)
+ 
libexpat_static_la_CFLAGS=	$(libexpat_la_CFLAGS)
+ 
libexpat_static_la_LDFLAGS=	-all-static
+ 
			

libyaml_la_SOURCES=	libyaml/src/api.c \

			libyaml/src/loader.c \

			libyaml/src/parser.c \
@@ -145,6 +154,10 @@ libyaml_la_CFLAGS= -I$(top_srcdir)/external/libyaml/include \
			-I$(top_srcdir)/external/libyaml \

			-Wno-strict-aliasing \

			-Wno-unused
+ 
libyaml_static_la_SOURCES=	$(libyaml_la_SOURCES)
+ 
libyaml_static_la_CFLAGS= $(libyaml_la_CFLAGS)
+ 
libyaml_static_la_LDFLAGS=	-all-static
+ 


libsqlite_la_SOURCES=	sqlite/sqlite3.c \

			sqlite/shell.c

libsqlite_la_CFLAGS=	-DHAVE_POSIX_FALLOCATE=1 \
@@ -188,6 +201,9 @@ libsqlite_la_CFLAGS= -DHAVE_POSIX_FALLOCATE=1 \
			-DSQLITE_TEMP_STORE=3 \

			-Dmain=sqlite3_shell \

			-DNDEBUG
+ 
libsqlite_static_la_SOURCES=	$(libsqlite_la_SOURCES)
+ 
libsqlite_static_la_CFLAGS=	$(libsqlite_la_CFLAGS)
+ 
libsqlite_static_la_LDFLAGS=	-all-static



CLEANFILES=	libelf/libelf_fsize.c \

			libelf/libelf_msize.c \
modified libpkg/Makefile.am
@@ -56,6 +56,24 @@ libpkg_la_LDFLAGS= -version-info 1 -pthread
lib_LTLIBRARIES=	libpkg.la

include_HEADERS=	pkg.h
+ 
libpkg_static_la_SOURCES=	$(libpkg_la_SOURCES)
+ 
libpkg_static_la_CFLAGS=	$(libpkg_la_CFLAGS)
+ 
libpkg_static_la_LIBADD=	$(top_builddir)/external/libucl_static.la \
+ 
			$(top_builddir)/external/libsqlite_static.la \
+ 
			$(top_builddir)/external/libyaml_static.la \
+ 
			@LIBELF_LIB@ \
+ 
			-larchive \
+ 
			-lsbuf \
+ 
			-lfetch \
+ 
			-lutil \
+ 
			-lssl \
+ 
			-lcrypto \
+ 
			-lbz2 \
+ 
			-lz \
+ 
			-llzma
+ 
libpkg_static_la_LDFLAGS=	-all-static
+ 
noinst_LTLIBRARIES=	libpkg_static.la
+ 


noinst_HEADERS=		private/db_upgrades.h \

			private/elf_tables.h \

			private/event.h \
modified src/Makefile.am
@@ -75,9 +75,10 @@ pkg_CFLAGS= -I$(top_srcdir)/libpkg \
			-DGITHASH=\"$(GIT_HEAD)\"

pkg_static_CFLAGS=	$(pkg_CFLAGS)

pkg_static_SOURCES=	$(pkg_SOURCES)
- 
pkg_static_LDADD=	$(top_builddir)/external/libucl_static.la \
- 
			$(pkg_LDADD)
- 
pkg_static_LDFLAGS=	-all-static -static-libtool-libs
+ 
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

sbin_PROGRAMS=		pkg pkg-static



dist_sysconf_DATA=	pkg.conf.sample
 

\ No newline at end of file