RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-04-08 02:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefiles: override *FLAGS and *LIBS

Browse Source 
There were several places in the makefiles where LDLIBS or CFLAGS were
supposed to include options to build. They were missing the override
keyword so would be skipped if these vars were set on the make cmdline.
Add the override directive to fix this.

Signed-off-by: Jason Zaman <jason@perfinion.com>
This commit is contained in:
Jason Zaman 2017-06-20 23:16:41 +08:00 committed by Stephen Smalley
parent 34dc7bcc31
commit 15f2740733
18 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsemanage/tests/Makefile
View File

@ -4,24 +4,19 @@ LIBDIR ?= $(PREFIX)/lib
# Add your test source files here: # Add your test source files here:
SOURCES = $(sort $(wildcard *.c)) SOURCES = $(sort $(wildcard *.c))
# Add the required external object files here:
LIBS = ../src/libsemanage.a -lselinux -lsepol
########################################################################### ###########################################################################
EXECUTABLE = libsemanage-tests EXECUTABLE = libsemanage-tests
CFLAGS += -g -O0 -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute -Wno-unused-parameter CFLAGS += -g -O0 -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute -Wno-unused-parameter
INCLUDE = -I../src -I../include override CFLAGS += -I../src -I../include
LDLIBS += -lcunit -lbz2 -laudit override LDLIBS += -lcunit -lbz2 -laudit ../src/libsemanage.a -lselinux -lsepol
OBJECTS = $(SOURCES:.c=.o) OBJECTS = $(SOURCES:.c=.o)
all: $(EXECUTABLE) all: $(EXECUTABLE)
$(EXECUTABLE): $(OBJECTS) ../src/libsemanage.a $(EXECUTABLE): $(OBJECTS) ../src/libsemanage.a
$(CC) $(OBJECTS) $(LIBS) $(LDFLAGS) -o $@ $(LDLIBS) $(CC) $(OBJECTS) $(LDFLAGS) -o $@ $(LDLIBS)
%.o: %.c
$(CC) $(CFLAGS) $(INCLUDE) -c $*.c -o $*.o
clean distclean: clean distclean:
rm -rf $(OBJECTS) $(EXECUTABLE) rm -rf $(OBJECTS) $(EXECUTABLE)

2
libsepol/utils/Makefile
View File

@ -5,7 +5,7 @@ BINDIR ?= $(PREFIX)/bin
CFLAGS ?= -Wall -Werror CFLAGS ?= -Wall -Werror
override CFLAGS += -I../include override CFLAGS += -I../include
override LDFLAGS += -L../src override LDFLAGS += -L../src
LDLIBS += -lsepol override LDLIBS += -lsepol
TARGETS=$(patsubst %.c,%,$(sort $(wildcard *.c))) TARGETS=$(patsubst %.c,%,$(sort $(wildcard *.c)))

2
mcstrans/utils/Makefile
View File

@ -6,7 +6,7 @@ LIBSEPOLA ?= $(LIBDIR)/libsepol.a
CFLAGS ?= -Wall CFLAGS ?= -Wall
override CFLAGS += -I../src -D_GNU_SOURCE override CFLAGS += -I../src -D_GNU_SOURCE
LDLIBS += -lselinux -lpcre override LDLIBS += -lselinux -lpcre
TARGETS=$(patsubst %.c,%,$(sort $(wildcard *.c))) TARGETS=$(patsubst %.c,%,$(sort $(wildcard *.c)))

2
policycoreutils/hll/pp/Makefile
View File

@ -8,7 +8,7 @@ LIBEXECDIR ?= $(PREFIX)/libexec
HLLDIR ?= $(LIBEXECDIR)/selinux/hll HLLDIR ?= $(LIBEXECDIR)/selinux/hll
CFLAGS ?= -Werror -Wall -W CFLAGS ?= -Werror -Wall -W
LDLIBS = -lsepol override LDLIBS += -lsepol
PP_SRCS = $(sort $(wildcard *.c)) PP_SRCS = $(sort $(wildcard *.c))
PP_OBJS = $(patsubst %.c,%.o,$(PP_SRCS)) PP_OBJS = $(patsubst %.c,%.o,$(PP_SRCS))

2
policycoreutils/load_policy/Makefile
View File

@ -7,7 +7,7 @@ LOCALEDIR ?= /usr/share/locale
CFLAGS ?= -Werror -Wall -W CFLAGS ?= -Werror -Wall -W
override CFLAGS += $(LDFLAGS) -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" override CFLAGS += $(LDFLAGS) -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
LDLIBS += -lsepol -lselinux override LDLIBS += -lsepol -lselinux
TARGETS=$(patsubst %.c,%,$(sort $(wildcard *.c))) TARGETS=$(patsubst %.c,%,$(sort $(wildcard *.c)))

10
policycoreutils/newrole/Makefile
View File

@ -23,18 +23,18 @@ VERSION = $(shell cat ../VERSION)
CFLAGS ?= -Werror -Wall -W CFLAGS ?= -Werror -Wall -W
EXTRA_OBJS = EXTRA_OBJS =
override CFLAGS += -DVERSION=\"$(VERSION)\" -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" override CFLAGS += -DVERSION=\"$(VERSION)\" -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
LDLIBS += -lselinux override LDLIBS += -lselinux
ifeq ($(PAMH), y) ifeq ($(PAMH), y)
override CFLAGS += -DUSE_PAM override CFLAGS += -DUSE_PAM
EXTRA_OBJS += hashtab.o EXTRA_OBJS += hashtab.o
LDLIBS += -lpam -lpam_misc override LDLIBS += -lpam -lpam_misc
else else
override CFLAGS += -D_XOPEN_SOURCE=500 override CFLAGS += -D_XOPEN_SOURCE=500
LDLIBS += -lcrypt override LDLIBS += -lcrypt
endif endif
ifeq ($(AUDITH), y) ifeq ($(AUDITH), y)
override CFLAGS += -DUSE_AUDIT override CFLAGS += -DUSE_AUDIT
LDLIBS += -laudit override LDLIBS += -laudit
endif endif
ifeq ($(LSPP_PRIV),y) ifeq ($(LSPP_PRIV),y)
override AUDIT_LOG_PRIV=y override AUDIT_LOG_PRIV=y
@ -50,7 +50,7 @@ ifeq ($(NAMESPACE_PRIV),y)
endif endif
ifeq ($(IS_SUID),y) ifeq ($(IS_SUID),y)
MODE := 4555 MODE := 4555
LDLIBS += -lcap-ng override LDLIBS += -lcap-ng
else else
MODE := 0555 MODE := 0555
endif endif

8
policycoreutils/run_init/Makefile
View File

@ -10,17 +10,17 @@ AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y)
CFLAGS ?= -Werror -Wall -W CFLAGS ?= -Werror -Wall -W
override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
LDLIBS += -lselinux override LDLIBS += -lselinux
ifeq ($(PAMH), y) ifeq ($(PAMH), y)
override CFLAGS += -DUSE_PAM override CFLAGS += -DUSE_PAM
LDLIBS += -lpam -lpam_misc override LDLIBS += -lpam -lpam_misc
else else
override CFLAGS += -D_XOPEN_SOURCE=500 override CFLAGS += -D_XOPEN_SOURCE=500
LDLIBS += -lcrypt override LDLIBS += -lcrypt
endif endif
ifeq ($(AUDITH), y) ifeq ($(AUDITH), y)
override CFLAGS += -DUSE_AUDIT override CFLAGS += -DUSE_AUDIT
LDLIBS += -laudit override LDLIBS += -laudit
endif endif
TARGETS=$(patsubst %.c,%,$(sort $(wildcard *.c))) TARGETS=$(patsubst %.c,%,$(sort $(wildcard *.c)))

2
policycoreutils/secon/Makefile
View File

@ -9,7 +9,7 @@ WARNS=-Werror -W -Wall -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wca
VERSION = $(shell cat ../VERSION) VERSION = $(shell cat ../VERSION)
CFLAGS ?= $(WARNS) -O1 CFLAGS ?= $(WARNS) -O1
override CFLAGS += -DVERSION=\"$(VERSION)\" override CFLAGS += -DVERSION=\"$(VERSION)\"
LDLIBS = -lselinux override LDLIBS += -lselinux
all: secon all: secon

3
policycoreutils/semodule/Makefile
View File

@ -6,13 +6,12 @@ MANDIR = $(PREFIX)/share/man
LIBDIR ?= $(PREFIX)/lib LIBDIR ?= $(PREFIX)/lib
CFLAGS ?= -Werror -Wall -W CFLAGS ?= -Werror -Wall -W
LDLIBS = -lsepol -lselinux -lsemanage override LDLIBS += -lsepol -lselinux -lsemanage
SEMODULE_OBJS = semodule.o SEMODULE_OBJS = semodule.o
all: semodule genhomedircon all: semodule genhomedircon
semodule: $(SEMODULE_OBJS) semodule: $(SEMODULE_OBJS)
$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
genhomedircon: genhomedircon:
ln -sf semodule genhomedircon ln -sf semodule genhomedircon

6
policycoreutils/sestatus/Makefile
View File

@ -7,11 +7,11 @@ LIBDIR ?= $(PREFIX)/lib
CFLAGS ?= -Werror -Wall -W CFLAGS ?= -Werror -Wall -W
override CFLAGS += -D_FILE_OFFSET_BITS=64 override CFLAGS += -D_FILE_OFFSET_BITS=64
LDLIBS = -lselinux override LDLIBS += -lselinux
all: sestatus all: sestatus
sestatus: sestatus.o sestatus: sestatus.o
install: all install: all
[ -d $(MANDIR)/man8 ] || mkdir -p $(MANDIR)/man8 [ -d $(MANDIR)/man8 ] || mkdir -p $(MANDIR)/man8
@ -24,7 +24,7 @@ install: all
install -m 644 sestatus.conf $(ETCDIR) install -m 644 sestatus.conf $(ETCDIR)
clean: clean:
rm -f sestatus *.o rm -f sestatus *.o
indent: indent:
../../scripts/Lindent $(wildcard *.[ch]) ../../scripts/Lindent $(wildcard *.[ch])

8
policycoreutils/setfiles/Makefile
View File

@ -8,21 +8,21 @@ AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y)
ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }') ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }')
CFLAGS ?= -g -Werror -Wall -W CFLAGS ?= -g -Werror -Wall -W
LDLIBS = -lselinux -lsepol override LDLIBS += -lselinux -lsepol
ifeq ($(AUDITH), y) ifeq ($(AUDITH), y)
override CFLAGS += -DUSE_AUDIT override CFLAGS += -DUSE_AUDIT
LDLIBS += -laudit override LDLIBS += -laudit
endif endif
all: setfiles restorecon restorecon_xattr man all: setfiles restorecon restorecon_xattr man
setfiles: setfiles.o restore.o setfiles: setfiles.o restore.o
restorecon: setfiles restorecon: setfiles
ln -sf setfiles restorecon ln -sf setfiles restorecon
restorecon_xattr: restorecon_xattr.o restore.o restorecon_xattr: restorecon_xattr.o restore.o
man: man:
@cp -af setfiles.8 setfiles.8.man @cp -af setfiles.8 setfiles.8.man

2
policycoreutils/setsebool/Makefile
View File

@ -7,7 +7,7 @@ LIBDIR ?= $(PREFIX)/lib
BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions
CFLAGS ?= -Werror -Wall -W CFLAGS ?= -Werror -Wall -W
LDLIBS = -lsepol -lselinux -lsemanage override LDLIBS += -lsepol -lselinux -lsemanage
SETSEBOOL_OBJS = setsebool.o SETSEBOOL_OBJS = setsebool.o
BASHCOMPLETIONS=setsebool-bash-completion.sh BASHCOMPLETIONS=setsebool-bash-completion.sh

2
restorecond/Makefile
View File

@ -29,7 +29,7 @@ else
endif endif
export PCRE_CFLAGS PCRE_LDLIBS export PCRE_CFLAGS PCRE_LDLIBS
LDLIBS += -lselinux $(PCRE_LDLIBS) $(DBUSLIB) override LDLIBS += -lselinux $(PCRE_LDLIBS) $(DBUSLIB)
all: restorecond all: restorecond

2
sandbox/Makefile
View File

@ -10,7 +10,7 @@ MANDIR ?= $(PREFIX)/share/man
LOCALEDIR ?= /usr/share/locale LOCALEDIR ?= /usr/share/locale
SHAREDIR ?= $(PREFIX)/share/sandbox SHAREDIR ?= $(PREFIX)/share/sandbox
override CFLAGS += -DPACKAGE="\"policycoreutils\"" -Wall -Werror -Wextra -W override CFLAGS += -DPACKAGE="\"policycoreutils\"" -Wall -Werror -Wextra -W
LDLIBS += -lselinux -lcap-ng override LDLIBS += -lselinux -lcap-ng
SEUNSHARE_OBJS = seunshare.o SEUNSHARE_OBJS = seunshare.o
all: sandbox seunshare sandboxX.sh start all: sandbox seunshare sandboxX.sh start

3
secilc/Makefile
View File

@ -4,8 +4,6 @@ MANDIR ?= $(PREFIX)/share/man
LIBDIR ?= $(PREFIX)/lib LIBDIR ?= $(PREFIX)/lib
INCLUDEDIR ?= $(PREFIX)/include INCLUDEDIR ?= $(PREFIX)/include
LDLIBS = -lsepol
SECILC = secilc SECILC = secilc
SECILC_SRCS := secilc.c SECILC_SRCS := secilc.c
SECILC_OBJS := $(patsubst %.c,%.o,$(SECILC_SRCS)) SECILC_OBJS := $(patsubst %.c,%.o,$(SECILC_SRCS))
@ -21,6 +19,7 @@ XMLTO = xmlto
CFLAGS ?= -Wall -Wshadow -Wextra -Wundef -Wmissing-format-attribute -Wcast-align -Wstrict-prototypes -Wpointer-arith -Wunused CFLAGS ?= -Wall -Wshadow -Wextra -Wundef -Wmissing-format-attribute -Wcast-align -Wstrict-prototypes -Wpointer-arith -Wunused
override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
override LDLIBS += -lsepol
all: $(SECILC) $(SECIL2CONF) man all: $(SECILC) $(SECIL2CONF) man

2
semodule-utils/semodule_expand/Makefile
View File

@ -6,7 +6,7 @@ LIBDIR ?= $(PREFIX)/lib
MANDIR ?= $(PREFIX)/share/man MANDIR ?= $(PREFIX)/share/man
CFLAGS ?= -Werror -Wall -W CFLAGS ?= -Werror -Wall -W
LDLIBS = -lsepol override LDLIBS += -lsepol
all: semodule_expand all: semodule_expand

2
semodule-utils/semodule_link/Makefile
View File

@ -6,7 +6,7 @@ MANDIR ?= $(PREFIX)/share/man
LIBDIR ?= $(PREFIX)/lib LIBDIR ?= $(PREFIX)/lib
CFLAGS ?= -Werror -Wall -W CFLAGS ?= -Werror -Wall -W
LDLIBS = -lsepol override LDLIBS += -lsepol
all: semodule_link all: semodule_link

2
semodule-utils/semodule_package/Makefile
View File

@ -6,7 +6,7 @@ LIBDIR ?= $(PREFIX)/lib
MANDIR ?= $(PREFIX)/share/man MANDIR ?= $(PREFIX)/share/man
CFLAGS ?= -Werror -Wall -W CFLAGS ?= -Werror -Wall -W
LDLIBS = -lsepol override LDLIBS += -lsepol
all: semodule_package semodule_unpackage all: semodule_package semodule_unpackage