You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
201 lines
6.4 KiB
201 lines
6.4 KiB
From 8599fc87e91b7903cfb1877983615dadcbcc1b29 Mon Sep 17 00:00:00 2001
|
|
From: Mike Frysinger <vapier@gentoo.org>
|
|
Date: Tue, 5 May 2020 09:52:40 +0200
|
|
Subject: [PATCH] build system fixes
|
|
|
|
This touches up the homebrewed build system to work much better "out of the
|
|
box" for people. Specifically:
|
|
- allow toolchain vars to be set via environment
|
|
- CC / BUILD_CC / AR / RANLIB
|
|
- CFLAGS / CPPFLAGS / LDFLAGS
|
|
- split CPPFLAGS out of CFLAGS
|
|
- break -fPIC out of global CFLAGS and only use where needed
|
|
- use LDLIBS for libraries, not LDFLAGS
|
|
|
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
Forward ported from libcap-2.24 to libcap-2.25
|
|
Forward ported from libcap-2.25 to libcap-2.28
|
|
Forward ported from libcap-2.28 to libcap-2.29
|
|
Forward ported from libcap-2.29 to libcap-2.33
|
|
Forward ported from libcap-2.33 to libcap-2.34
|
|
Forward ported from libcap-2.34 to libcap-2.37
|
|
Forward ported from libcap-2.37 to libcap-2.39
|
|
Forward ported from libcap-2.39 to libcap-2.42
|
|
|
|
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
---
|
|
Make.Rules | 12 +++++++-----
|
|
Makefile | 1 -
|
|
libcap/Makefile | 7 ++++---
|
|
pam_cap/Makefile | 8 +++++---
|
|
progs/Makefile | 2 +-
|
|
tests/Makefile | 6 ++++--
|
|
6 files changed, 21 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/Make.Rules b/Make.Rules
|
|
index 8440e18..67fd4a6 100644
|
|
--- a/Make.Rules
|
|
+++ b/Make.Rules
|
|
@@ -52,13 +52,12 @@ GOMAJOR=0
|
|
# Compilation specifics
|
|
|
|
KERNEL_HEADERS := $(topdir)/libcap/include/uapi
|
|
-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
|
|
|
|
CC ?= $(CROSS_COMPILE)gcc
|
|
DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
|
CFLAGS ?= -O2 $(DEFINES)
|
|
BUILD_CC ?= $(CC)
|
|
-BUILD_CFLAGS ?= -O2 $(DEFINES) $(IPATH)
|
|
+BUILD_CFLAGS ?= $(CFLAGS)
|
|
AR ?= $(CROSS_COMPILE)ar
|
|
RANLIB ?= $(CROSS_COMPILE)ranlib
|
|
DEBUG = -g #-DDEBUG
|
|
@@ -73,16 +72,19 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread
|
|
|
|
BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
|
|
|
|
-SYSTEM_HEADERS = /usr/include
|
|
+LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES)
|
|
+CPPFLAGS += $(LIBCAP_CPPFLAGS)
|
|
+BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS)
|
|
INCS=$(topdir)/libcap/include/sys/capability.h
|
|
LDFLAGS += -L$(topdir)/libcap
|
|
-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
|
|
+CPPFLAGS += -Dlinux
|
|
+CFLAGS += $(WARNINGS) $(DEBUG)
|
|
PAM_CAP ?= $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
|
|
INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
|
|
DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
|
|
|
|
GO := go
|
|
-GOLANG := $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
|
|
+GOLANG ?= $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
|
|
ifeq ($(GOLANG),yes)
|
|
GOROOT := $(shell $(GO) env GOROOT)
|
|
GOCGO := $(shell if [ "$(shell $(GO) env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi)
|
|
diff --git a/Makefile b/Makefile
|
|
index 03d7748..4437468 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes)
|
|
$(MAKE) -C go $@
|
|
rm -f cap/go.sum
|
|
endif
|
|
- $(MAKE) -C tests $@
|
|
$(MAKE) -C progs $@
|
|
$(MAKE) -C doc $@
|
|
$(MAKE) -C kdebug $@
|
|
diff --git a/libcap/Makefile b/libcap/Makefile
|
|
index 81b089e..63fe555 100644
|
|
--- a/libcap/Makefile
|
|
+++ b/libcap/Makefile
|
|
@@ -21,6 +21,7 @@ PSXOBJS=$(addsuffix .o, $(PSXFILES))
|
|
MAJLIBNAME=$(LIBNAME).$(VERSION)
|
|
MINLIBNAME=$(MAJLIBNAME).$(MINOR)
|
|
GPERF_OUTPUT = _caps_output.gperf
|
|
+CFLAGS += -fPIC
|
|
|
|
all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME)
|
|
|
|
@@ -50,7 +51,7 @@ libpsx.pc: libpsx.pc.in
|
|
$< >$@
|
|
|
|
_makenames: _makenames.c cap_names.list.h
|
|
- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
|
|
+ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
|
|
|
|
cap_names.h: _makenames
|
|
./_makenames > cap_names.h
|
|
@@ -82,10 +83,10 @@ $(MINLIBNAME): $(CAPOBJS)
|
|
ln -sf $(MAJLIBNAME) $(LIBNAME)
|
|
|
|
%.o: %.c $(INCLS)
|
|
- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@
|
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
|
|
|
|
cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
|
|
- $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
|
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
|
|
|
|
cap_test: cap_test.c libcap.h
|
|
$(CC) $(CFLAGS) $(IPATH) $< -o $@
|
|
diff --git a/pam_cap/Makefile b/pam_cap/Makefile
|
|
index 56604fd..2da4674 100644
|
|
--- a/pam_cap/Makefile
|
|
+++ b/pam_cap/Makefile
|
|
@@ -3,6 +3,8 @@
|
|
topdir=$(shell pwd)/..
|
|
include ../Make.Rules
|
|
|
|
+CFLAGS += -fPIC
|
|
+
|
|
all: pam_cap.so
|
|
$(MAKE) testlink
|
|
|
|
@@ -16,16 +18,16 @@ install: all
|
|
# written (and you know why it fails), email me and explain why. Thanks!
|
|
|
|
pam_cap.so: pam_cap.o
|
|
- $(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
|
|
+ $(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
|
|
|
|
pam_cap.o: pam_cap.c
|
|
- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@
|
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
|
|
|
|
test_pam_cap: test_pam_cap.c pam_cap.c
|
|
$(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static
|
|
|
|
testlink: test.c pam_cap.o
|
|
- $(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
|
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
|
|
|
|
test: pam_cap.so
|
|
make testlink
|
|
diff --git a/progs/Makefile b/progs/Makefile
|
|
index 076e44f..fd13351 100644
|
|
--- a/progs/Makefile
|
|
+++ b/progs/Makefile
|
|
@@ -23,7 +23,7 @@ $(BUILD): %: %.o $(DEPS)
|
|
$(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
|
|
|
|
%.o: %.c $(INCS)
|
|
- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -c $< -o $@
|
|
+ $(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
|
|
|
|
install: all
|
|
mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
|
|
diff --git a/tests/Makefile b/tests/Makefile
|
|
index bfedbc2..2b9a801 100644
|
|
--- a/tests/Makefile
|
|
+++ b/tests/Makefile
|
|
@@ -16,19 +16,21 @@ test: run_psx_test run_libcap_psx_test
|
|
|
|
sudotest: test run_libcap_launch_test run_libcap_launch_test
|
|
|
|
+CFLAGS += -fPIC
|
|
+
|
|
install: all
|
|
|
|
run_psx_test: psx_test
|
|
./psx_test
|
|
|
|
psx_test: psx_test.c $(DEPS)
|
|
- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
|
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
|
|
|
|
run_libcap_psx_test: libcap_psx_test
|
|
./libcap_psx_test
|
|
|
|
libcap_psx_test: libcap_psx_test.c $(DEPS)
|
|
- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
|
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
|
|
|
|
run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
|
|
sudo ./libcap_launch_test
|
|
--
|
|
2.28.0
|
|
|