RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libselinux: use PCRE2 by default 

Quoting pcre.org:

    There are two major versions of the PCRE library. The current
    version, PCRE2, released in 2015, is now at version 10.39.

    The older, but still widely deployed PCRE library, originally
    released in 1997, is at version 8.45. This version of PCRE is now at
    end of life, and is no longer being actively maintained. Version
    8.45 is expected to be the final release of the older PCRE library,
    and new projects should use PCRE2 instead.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
This commit is contained in:
Christian Göttsche 2021-11-23 19:32:48 +01:00 committed by James Carter
parent 647909cb90
commit e0da140d82
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libselinux/Makefile
View File

@ -23,7 +23,7 @@ ifeq ($(DISABLE_X11),y)
endif endif
export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11 LABEL_BACKEND_ANDROID export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11 LABEL_BACKEND_ANDROID
USE_PCRE2 ?= n USE_PCRE2 ?= y
ifeq ($(USE_PCRE2),y) ifeq ($(USE_PCRE2),y)
PCRE_MODULE := libpcre2-8 PCRE_MODULE := libpcre2-8
PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8

1
libselinux/src/Makefile
View File

@ -98,7 +98,6 @@ override LDFLAGS += -L/opt/local/lib -undefined dynamic_lookup
LD_SONAME_FLAGS=-install_name,$(LIBSO) LD_SONAME_FLAGS=-install_name,$(LIBSO)
endif endif
PCRE_LDLIBS ?= -lpcre
# override with -lfts when building on Musl libc to use fts-standalone # override with -lfts when building on Musl libc to use fts-standalone
FTS_LDLIBS ?= FTS_LDLIBS ?=

1
libselinux/utils/Makefile
View File

@ -44,7 +44,6 @@ endif
override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS)
override LDFLAGS += -L../src override LDFLAGS += -L../src
override LDLIBS += -lselinux $(FTS_LDLIBS) override LDLIBS += -lselinux $(FTS_LDLIBS)
PCRE_LDLIBS ?= -lpcre
ifeq ($(ANDROID_HOST),y) ifeq ($(ANDROID_HOST),y)
TARGETS=sefcontext_compile TARGETS=sefcontext_compile