libselinux: Add build option to disable X11 backend
PATCH 1/1 libselinux: Add build option to disable X11 backend
Add build option to libselinux to disable the X11 backend without using ANDROID_HOST.
Signed-off-by Björn Bidar <[email protected]>
--- libselinux/Makefile | 5 ++++- libselinux/src/Makefile | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)
libselinux/Makefile +4 -1
@@ -17,7 +17,10 @@ endif ifeq ($(DISABLE_BOOL),y) DISABLE_FLAGS+= -DDISABLE_BOOL endif -export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST +ifeq ($(DISABLE_X11),y) + DISABLE_FLAGS+= -DNO_X_BACKEND +endif +export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11 USE_PCRE2 ?= n ifeq ($(USE_PCRE2),y)
libselinux/src/Makefile +4 -0
@@ -126,6 +126,10 @@ DISABLE_FLAGS+= -DNO_ANDROID_BACKEND SRCS:= $(filter-out label_backends_android.c, $(SRCS)) endif +ifeq ($(DISABLE_X11),y) +SRCS:= $(filter-out label_x.c, $(SRCS)) +endif + SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS) all: $(LIBA) $(LIBSO) $(LIBPC)
Signature · 1 line
2.28.0
Quoted 42 lines · Björn Bidar
Add build option to libselinux to disable the X11 backend without using
ANDROID_HOST.Signed-off-by Björn Bidar <[email protected]>--- libselinux/Makefile | 5 ++++- libselinux/src/Makefile | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)libselinux/Makefile +4
-1@@ -17,7 +17,10 @@ endif ifeq ($(DISABLE_BOOL),y) DISABLE_FLAGS+= -DDISABLE_BOOL endif -export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST +ifeq ($(DISABLE_X11),y) + DISABLE_FLAGS+= -DNO_X_BACKEND +endif +export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11 USE_PCRE2 ?= n ifeq ($(USE_PCRE2),y)libselinux/src/Makefile +4
-1@@ -126,6 +126,10 @@ DISABLE_FLAGS+= -DNO_ANDROID_BACKEND SRCS:= $(filter-out label_backends_android.c, $(SRCS)) endif +ifeq ($(DISABLE_X11),y) +SRCS:= $(filter-out label_x.c, $(SRCS)) +endif + SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS) all: $(LIBA) $(LIBSO) $(LIBPC) --
Quoted 2 lines
2.28.0
Acked-by William Roberts <[email protected]>
Quoted 42 lines · William Roberts
Quoted 40 lines · Björn Bidar
Add build option to libselinux to disable the X11 backend without using
ANDROID_HOST.Signed-off-by Björn Bidar <[email protected]>--- libselinux/Makefile | 5 ++++- libselinux/src/Makefile | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)libselinux/Makefile +4
-1@@ -17,7 +17,10 @@ endif ifeq ($(DISABLE_BOOL),y) DISABLE_FLAGS+= -DDISABLE_BOOL endif -export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST +ifeq ($(DISABLE_X11),y) + DISABLE_FLAGS+= -DNO_X_BACKEND +endif +export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11 USE_PCRE2 ?= n ifeq ($(USE_PCRE2),y)libselinux/src/Makefile +4
-0@@ -126,6 +126,10 @@ DISABLE_FLAGS+= -DNO_ANDROID_BACKEND SRCS:= $(filter-out label_backends_android.c, $(SRCS)) endif +ifeq ($(DISABLE_X11),y) +SRCS:= $(filter-out label_x.c, $(SRCS)) +endif + SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS)
Quoted 6 lines
Quoted 4 lines
libselinux/src/Makefile +0
-1all: $(LIBA) $(LIBSO) $(LIBPC) --2.28.0
Acked-by William Roberts <[email protected]>
I see the PR was already staged, merged:
https://github.com/SELinuxProject/selinux/pull/264