Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Only export pkg's bundled symbols
Baptiste Daroussin committed 7 years ago
commit 217d1b10c2b5e247bee5c62bcc313fc672e9e700
parent f55f973
1 file changed +7 -8
modified src/Makefile.autosetup
@@ -43,17 +43,15 @@ LOCAL_CFLAGS= -I$(top_srcdir)/external/uthash \
		-I$(top_builddir)/libpkg \
		-DGITHASH=\"@GITHASH@\" \
		-DHAVE_CONFIG_H
-
LIBS=	\
-
	-L$(top_builddir)/libpkg -lpkg_flat \
-
	-lm \
-
	@EXTRA_LIBS@
+
LIBPKGFLAT=	-L$(top_builddir)/libpkg -lpkg_flat
+
LIBS=	@EXTRA_LIBS@

@if HAVE_PKG_LIBARCHIVE
LIBS+=	@PKG_LIBARCHIVE_LDFLAGS@ @PKG_LIBARCHIVE_LIBS_STATIC@
@else
LIBS+=	-larchive -lbz2 -lz -llzma
@endif
-
OTHER_LIBS=	-lssl -lcrypto -pthread
+
OTHER_LIBS=	-lm -lssl -lcrypto -pthread
@if HAVE_LIBUTIL
OTHER_LIBS+=	-lutil
@endif
@@ -65,16 +63,17 @@ OTHER_LIBS+= -lresolv
@endif

@if libabidir == libmachista
-
LOCAL_LDFLAGS=	$(LIBS) $(OTHER_LIBS)
+
LOCAL_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS)
@else
LOCAL_LDFLAGS=	-Wl,-Bstatic \
-
		-Wl,--whole-archive $(LIBS) -Wl,--no-whole-archive \
+
		-Wl,--whole-archive $(LIBPKGFLAT) -Wl,--no-whole-archive \
+
		$(LIBS) \
		-Wl,-Bdynamic $(OTHER_LIBS) \
		-Wl,--export-dynamic \
		-Wl,--version-script=$(top_builddir)/libpkg/libpkg.ver
@endif

-
STATIC_LDFLAGS=	$(LIBS) $(OTHER_LIBS)
+
STATIC_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS)

include $(MK)/prog.mk