Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › fbaaacc
Support out-of-tree builds
Nathaniel Wesley Filardo committed 3 years ago
commit fbaaacce6c5d533738514eae2087f42f8fd64076
parent 153b13b
15 files changed +44 -7
modified auto.def
@@ -359,3 +359,4 @@ foreach dir [list external/blake2 external/picosat \
	make-template $dir/Makefile.autosetup $dir/Makefile

}
+ 
file mkdir external/libucl/src scripts/periodic scripts/completion
modified compat/Makefile.autosetup
@@ -8,7 +8,10 @@ SRCS= closefrom.c \
	funopen.c



LOCAL_CFLAGS=	-I$(top_srcdir)/compat \
- 
		-I$(top_srcdir)
+ 
		-I$(top_srcdir) \
+ 
		-I$(top_builddir)
+
+ 
VPATH=	$(top_srcdir)/compat



include $(MK)/static-lib.mk
modified docs/Makefile.autosetup
@@ -46,18 +46,20 @@ MAN3GZ= $(MAN3:.3=.3.gz)
MAN5GZ=	$(MAN5:.5=.5.gz)

MAN8GZ=	$(MAN8:.8=.8.gz)
+ 
VPATH=	$(top_srcdir)/docs
+ 


.SUFFIXES: .3.gz .5.gz .8.gz .3 .5 .8



all: $(MAN3GZ) $(MAN5GZ) $(MAN8GZ)



.3.3.gz:
- 
	gzip -kfn $< > $@
+ 
	gzip -knc $< > $@



.5.5.gz:
- 
	gzip -kfn $< > $@
+ 
	gzip -knc $< > $@



.8.8.gz:
- 
	gzip -kfn $< > $@
+ 
	gzip -knc $< > $@



clean:

	rm -f *.gz
modified external/blake2/Makefile.autosetup
@@ -3,4 +3,6 @@ LIB= blake2
SRCS=	blake2b-ref.c blake2s-ref.c

LOCAL_CFLAGS=	-I$(top_srcdir)/compat -O3
+ 
VPATH=	$(top_srcdir)/external/blake2
+ 


include $(MK)/static-lib.mk
modified external/libfetch/Makefile.autosetup
@@ -6,9 +6,12 @@ SRCS= common.c \


LOCAL_CFLAGS=	-I$(top_srcdir)/compat \

		-I$(top_srcdir) \
+ 
		-I$(top_builddir) \

		-Wno-unused-parameter \

		-Wno-pointer-sign \

		-DWITH_SSL \

		-DINET6
+ 
VPATH=	$(top_srcdir)/external/libfetch
+ 


include $(MK)/static-lib.mk
modified external/libucl/Makefile.autosetup
@@ -17,4 +17,6 @@ LOCAL_CFLAGS= -I$(top_srcdir)/external/libucl/include \
		-Wno-unused-parameter \

		-Wno-pointer-sign
+ 
VPATH=	$(top_srcdir)/external/libucl
+ 


include $(MK)/static-lib.mk
modified external/linenoise/Makefile.autosetup
@@ -1,5 +1,6 @@
include @builddir@/mk/defs.mk

LIB=	linenoise

SRCS=	linenoise.c
+ 
VPATH=	$(top_srcdir)/external/linenoise



include $(MK)/static-lib.mk
modified external/msgpuck/Makefile.autosetup
@@ -5,5 +5,7 @@ LIB= msgpuck
SRCS=	msgpuck.c \

	hints.c
+ 
VPATH=	$(top_srcdir)/external/msgpuck
+ 


include $(MK)/static-lib.mk
modified external/picosat/Makefile.autosetup
@@ -4,4 +4,7 @@ SRCS= picosat.c \
	version.c

LOCAL_CFLAGS=	-Wno-strict-aliasing \

		-Wno-unused -DNGETRUSAGE
+
+ 
VPATH=	$(top_srcdir)/external/picosat
+ 


include $(MK)/static-lib.mk
modified external/sqlite/Makefile.autosetup
@@ -4,6 +4,7 @@ SRCS= sqlite3.c \
	shell.c



LOCAL_CFLAGS=	-I$(top_srcdir)/external/linenoise \
+ 
		-I$(top_builddir)/external/sqlite \

		-D_HAVE_SQLITE_CONFIG_H \

		-DHAVE_LINENOISE \

		-Wno-unused-variable \
@@ -39,4 +40,6 @@ LOCAL_CFLAGS= -I$(top_srcdir)/external/linenoise \
		-Dmain=sqlite3_shell \

		-DNDEBUG
+ 
VPATH=	$(top_srcdir)/external/sqlite
+ 


include $(MK)/static-lib.mk
modified external/yxml/Makefile.autosetup
@@ -4,7 +4,9 @@ LIB= yxml


SRCS=	yxml.c
- 
LOCAL_CFLAGS=	-Wno-unused-parameter -I.
+ 
LOCAL_CFLAGS=	-Wno-unused-parameter -I. -I$(top_srcdir)/external/yxml
+
+ 
VPATH=	$(top_srcdir)/external/yxml



include $(MK)/static-lib.mk
modified libpkg/Makefile.autosetup
@@ -63,8 +63,11 @@ LOCAL_CFLAGS= -I$(top_srcdir)/compat \
		-I$(top_srcdir)/external/liblua/ \

		-I$(top_srcdir)/external/msgpuck \

		-I$(top_srcdir)/libpkg/repo \
+ 
		-I$(top_builddir)/libpkg/repo \

		-I$(top_srcdir)/libpkg \
+ 
		-I$(top_builddir)/libpkg \

		-I$(top_srcdir) \
+ 
		-I$(top_builddir) \

		-Wno-pointer-sign \

		-Wno-missing-field-initializers \

		-Wno-sign-compare \
@@ -122,7 +125,7 @@ LOCAL_LDFLAGS+= -L$(top_builddir)/external/libmachista -lmachista_pic \
SRCS+=		pkg_macho.c

@else

SRCS+=		pkg_elf.c
- 
LOCAL_LDFLAGS+=	-Wl,--version-script=$(top_builddir)/libpkg/libpkg.ver \
+ 
LOCAL_LDFLAGS+=	-Wl,--version-script=$(top_srcdir)/libpkg/libpkg.ver \

@endif



@if libelf-internal
@@ -147,6 +150,8 @@ LOCAL_CFLAGS+= @PKG_LIBLDNS_CFLAGS@
LOCAL_LDFLAGS+=	@PKG_LIBLDNS_LDFLAGS@ @PKG_LIBLDNS_LIBS@

@endif
+ 
VPATH=	$(top_srcdir)/libpkg
+ 


include $(MK)/lib.mk



$(OBJS) $(SHOBJS): $(top_builddir)/pkg_config.h
modified libpkg/repo/binary/Makefile.autosetup
@@ -7,11 +7,15 @@ SRCS= binary.c \
	query.c \

	update.c

LOCAL_CFLAGS=	-I$(top_srcdir)/libpkg \
+ 
		-I$(top_builddir)/libpkg \

		-I$(top_srcdir)/external/uthash \

		-I$(top_srcdir)/external/sqlite \

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

		-I$(top_srcdir)/external/include \

		-I$(top_srcdir)/compat \

		-I$(top_srcdir)/ \
+ 
		-I$(top_builddir)/
+
+ 
VPATH=	$(top_srcdir)/libpkg/repo/binary



include $(MK)/static-lib.mk
modified scripts/Makefile.autosetup
@@ -20,6 +20,8 @@ PWEEKLY= periodic/400.status-pkg
COMPLETION=	completion/_pkg \

		completion/_pkg.bash
+ 
VPATH=	$(top_srcdir)/scripts
+ 


all: $(PDAILY) $(PSECURITY) $(PWEEKLY) $(COMPLETION)



clean:
modified src/Makefile.autosetup
@@ -41,6 +41,7 @@ LOCAL_CFLAGS= -I$(top_srcdir)/compat \
		-I$(top_srcdir)/external/libucl/include \

		-I$(top_srcdir)/external/include \

		-I$(top_builddir)/ \
+ 
		-I$(top_srcdir)/libpkg \

		-I$(top_builddir)/libpkg \

		-DGITHASH=\"@GITHASH@\" \

		-DHAVE_CONFIG_H
@@ -84,6 +85,7 @@ STATIC_ARG= -static
STATIC_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS)

@endif
+ 
VPATH=	$(top_srcdir)/src



include $(MK)/prog.mk
@@ -106,7 +108,7 @@ $(PROG): $(top_builddir)/libpkg/libpkg_flat.a
install: $(PROG)

	install -d -m 755 $(DESTDIR)$(sbindir)

	install -m 755 pkg $(DESTDIR)$(sbindir)/pkg
- 
	install -m 644 pkg.conf.sample $(DESTDIR)$(etcdir)/
+ 
	install -m 644 $(top_srcdir)/src/pkg.conf.sample $(DESTDIR)$(etcdir)/



clean: clean-pkg-static

clean-pkg-static: