5d8926add5
attr is no longer a dependency, not even optional. Refresh our patches, and drop the backport from upstream. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From d8d70559a279706c206761dfaf665d2197934123 Mon Sep 17 00:00:00 2001
|
|
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
Date: Sun, 6 Mar 2016 22:52:02 +0100
|
|
Subject: [PATCH] build-system: fixes for cross-compilation
|
|
|
|
Avoid the libcap buildsys forcing CC/CFLAGS/LDFLAGS/AR/RANLIB
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
[yann.morin.1998@free.fr: dont chmod +x the shared lib]
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
|
|
diff --git a/Make.Rules b/Make.Rules
|
|
index 8347b26..8a07a3f 100644
|
|
--- a/Make.Rules
|
|
+++ b/Make.Rules
|
|
@@ -48,26 +48,26 @@ MINOR=25
|
|
KERNEL_HEADERS := $(topdir)/libcap/include/uapi
|
|
IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
|
|
|
|
-CC := gcc
|
|
-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
|
-BUILD_CC := $(CC)
|
|
-BUILD_CFLAGS := $(CFLAGS) $(IPATH)
|
|
-AR := ar
|
|
-RANLIB := ranlib
|
|
+CC ?= gcc
|
|
+CFLAGS ?= -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
|
+BUILD_CC ?= $(CC)
|
|
+BUILD_CFLAGS ?= $(CFLAGS) $(IPATH)
|
|
+AR ?= ar
|
|
+RANLIB ?= ranlib
|
|
DEBUG = -g #-DDEBUG
|
|
WARNINGS=-Wall -Wwrite-strings \
|
|
-Wpointer-arith -Wcast-qual -Wcast-align \
|
|
-Wstrict-prototypes -Wmissing-prototypes \
|
|
-Wnested-externs -Winline -Wshadow
|
|
LD=$(CC) -Wl,-x -shared
|
|
-LDFLAGS := #-g
|
|
+LDFLAGS ?= #-g
|
|
BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
|
|
|
|
SYSTEM_HEADERS = /usr/include
|
|
INCS=$(topdir)/libcap/include/sys/capability.h
|
|
LDFLAGS += -L$(topdir)/libcap
|
|
CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
|
|
-PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
|
|
+PAM_CAP = no
|
|
INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
|
|
DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
|
|
|
|
--
|
|
1.9.1
|
|
|