mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-22 02:37:15 +00:00
955a3f9ad5
This includes various fixes that I submitted recently such as updating the pdkill() tests for the actual implemented behaviour (https://github.com/google/capsicum-test/pull/53) and lots of changes to avoid calling sleep() and replacing it with reliable synchronization (pull requests 49,51,52,53,54). This should make the testsuite more reliable when running on Jenkins. Additionally, process status is now retrieved using libprocstat instead of running `ps` and parsing the output (https://github.com/google/capsicum-test/pull/50). This fixes one previously failing test and speeds up execution. Overall, this update reduces the total runtime from ~60s to about 4-5 seconds.
83 lines
2.3 KiB
Makefile
83 lines
2.3 KiB
Makefile
OS:=$(shell uname)
|
|
|
|
# Set ARCH to 32 or x32 for i386/x32 ABIs
|
|
ARCH?=64
|
|
ARCHFLAG=-m$(ARCH)
|
|
|
|
ifeq ($(OS),FreeBSD)
|
|
EXTRA_LIBS=-lprocstat
|
|
endif
|
|
|
|
ifeq ($(OS),Linux)
|
|
PROCESSOR:=$(shell uname -p)
|
|
|
|
ifneq ($(wildcard /usr/lib/$(PROCESSOR)-linux-gnu),)
|
|
# Can use standard Debian location for static libraries.
|
|
PLATFORM_LIBDIR=/usr/lib/$(PROCESSOR)-linux-gnu
|
|
else
|
|
# Attempt to determine library location from gcc configuration.
|
|
PLATFORM_LIBDIR=$(shell gcc -v 2>&1 | grep "Configured with:" | sed 's/.*--libdir=\(\/usr\/[^ ]*\).*/\1/g')
|
|
endif
|
|
|
|
# Override for explicitly specified ARCHFLAG.
|
|
# Use locally compiled libcaprights in this case, on the
|
|
# assumption that any installed version is 64-bit.
|
|
ifeq ($(ARCHFLAG),-m32)
|
|
PROCESSOR=i386
|
|
PLATFORM_LIBDIR=/usr/lib32
|
|
LIBCAPRIGHTS=./libcaprights.a
|
|
endif
|
|
ifeq ($(ARCHFLAG),-mx32)
|
|
PROCESSOR=x32
|
|
PLATFORM_LIBDIR=/usr/libx32
|
|
LIBCAPRIGHTS=./libcaprights.a
|
|
endif
|
|
|
|
# Detect presence of libsctp in normal Debian location
|
|
ifneq ($(wildcard $(PLATFORM_LIBDIR)/libsctp.a),)
|
|
LIBSCTP=-lsctp
|
|
CXXFLAGS=-DHAVE_SCTP
|
|
endif
|
|
|
|
ifneq ($(LIBCAPRIGHTS),)
|
|
# Build local libcaprights.a (assuming ./configure
|
|
# has already been done in libcaprights/)
|
|
LOCAL_LIBS=$(LIBCAPRIGHTS)
|
|
LIBCAPRIGHTS_OBJS=libcaprights/capsicum.o libcaprights/linux-bpf-capmode.o libcaprights/procdesc.o libcaprights/signal.o
|
|
LOCAL_CLEAN=$(LOCAL_LIBS) $(LIBCAPRIGHTS_OBJS)
|
|
else
|
|
# Detect installed libcaprights static library.
|
|
ifneq ($(wildcard $(PLATFORM_LIBDIR)/libcaprights.a),)
|
|
LIBCAPRIGHTS=$(PLATFORM_LIBDIR)/libcaprights.a
|
|
else
|
|
ifneq ($(wildcard /usr/lib/libcaprights.a),)
|
|
LIBCAPRIGHTS=/usr/lib/libcaprights.a
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
endif
|
|
|
|
# Extra test programs for arch-transition tests
|
|
EXTRA_PROGS = mini-me.32 mini-me.64
|
|
ifneq ($(wildcard /usr/include/gnu/stubs-x32.h),)
|
|
EXTRA_PROGS += mini-me.x32
|
|
endif
|
|
|
|
# Chain on to the master makefile
|
|
include makefile
|
|
|
|
./libcaprights.a: $(LIBCAPRIGHTS_OBJS)
|
|
ar cr $@ $^
|
|
|
|
# Small static programs of known architectures
|
|
# These may require additional packages to be installed; for example, for Debian:
|
|
# - libc6-dev-i386 provides 32-bit headers for a 64-bit system
|
|
# - libc6-dev-x32 provides headers for the x32 ABI.
|
|
mini-me.32: mini-me.c
|
|
$(CC) $(CFLAGS) -m32 -static -o $@ $<
|
|
mini-me.x32: mini-me.c
|
|
$(CC) $(CFLAGS) -mx32 -static -o $@ $<
|
|
mini-me.64: mini-me.c
|
|
$(CC) $(CFLAGS) -m64 -static -o $@ $<
|