Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › c6a935d
Fix overlinking on macOS
Mohamed Akram committed 1 month ago
commit c6a935dde392c6ffa2b5086b59f463a1c19863d3
parent df7c6bd
2 files changed +7 -10
modified libpkg/Makefile.autosetup
@@ -131,9 +131,7 @@ LOCAL_LDFLAGS+= -ldl
@endif



@if pkgos_darwin
- 
LOCAL_LDFLAGS+=	-lresolv -lz \
- 
	-framework CoreFoundation -framework CoreServices \
- 
	-framework SystemConfiguration
+ 
LOCAL_LDFLAGS+=	-lresolv

@else

@if pkgos_freebsd

LOCAL_LDFLAGS+=	-Wl,--version-script=$(top_srcdir)/libpkg/libpkg.ver,--undefined-version
modified src/Makefile.autosetup
@@ -55,7 +55,7 @@ OTHER_LIBS= @EXTRA_LIBS@ -lm -pthread
OTHER_LIBS+=	@PKG_LIBARCHIVE_LDFLAGS@ @PKG_LIBARCHIVE_LIBS@

LOCAL_CFLAGS+=	@PKG_LIBARCHIVE_CFLAGS@

@else
- 
OTHER_LIBS+=	-larchive -lbz2 -lz -llzma @ZSTDLIB@
+ 
OTHER_LIBS+=	-larchive

@endif



@if HAVE_LIBUTIL
@@ -83,12 +83,8 @@ OTHER_LIBS+= -lmd
@endif



@if pkgos_darwin
- 
LOCAL_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv -lz \
- 
	-framework CoreFoundation -framework CoreServices \
- 
	-framework SystemConfiguration
- 
STATIC_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv -lz \
- 
	-framework CoreFoundation -framework CoreServices \
- 
	-framework SystemConfiguration
+ 
LOCAL_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv
+ 
STATIC_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv

# OSX doesn't support static binaries, sigh

STATIC_ARG=

@else
@@ -101,6 +97,9 @@ STATIC_ARG= -static
STATIC_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS)

@endif
+ 
# For libarchive
+ 
STATIC_LDFLAGS+=	-lbz2 -lz -llzma @ZSTDLIB@
+ 


VPATH=	$(top_srcdir)/src



include $(MK)/prog.mk