Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 0eb4726
Another try to fix static build.
Vsevolod Stakhov committed 12 years ago
commit 0eb472646bea14b0905224b6679b8887cfb3f38b
parent 8e53176
2 files changed +7 -3
modified external/Makefile.am
@@ -57,6 +57,8 @@ 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@
+ 


libelf_la_SOURCES=	libelf/elf.c \

			libelf/elf_begin.c \

			libelf/elf_cntl.c \
@@ -116,8 +118,6 @@ libelf_la_SOURCES= libelf/elf.c \
			libelf/libelf_msize.c \

			libelf/libelf_convert.c

libelf_la_CFLAGS=	-I$(top_srcdir)/external/libelf
-
- 
noinst_LTLIBRARIES=	libucl.la libsqlite.la libyaml.la libexpat.la @LIBELF_BUNDLED@



libucl_la_SOURCES=	libucl/src/ucl_emitter.c \

			libucl/src/ucl_hash.c \
@@ -128,6 +128,9 @@ libucl_la_CFLAGS= -I$(top_srcdir)/external//libucl/uthash \
			-I$(top_srcdir)/external/libucl/include  \

			-I$(top_srcdir)/external//libucl/src \

			-Wno-unused-parameter -Wno-pointer-sign
+ 
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
modified src/Makefile.am
@@ -75,7 +75,8 @@ pkg_CFLAGS= -I$(top_srcdir)/libpkg \
			-DGITHASH=\"$(GIT_HEAD)\"

pkg_static_CFLAGS=	$(pkg_CFLAGS)

pkg_static_SOURCES=	$(pkg_SOURCES)
- 
pkg_static_LDADD=	$(pkg_LDADD)
+ 
pkg_static_LDADD=	$(top_builddir)/external/libucl_static.la \
+ 
			$(pkg_LDADD)

pkg_static_LDFLAGS=	-all-static -static-libtool-libs

sbin_PROGRAMS=		pkg pkg-static