On 31/08/2012 20:36, Stephen Smalley wrote:
On Fri, Aug 31, 2012 at 1:49 PM, Eric Paris <eparis@xxxxxxxxxx> wrote:
The PCRE functions are about x10 faster than the glibc functions. So
use the external library.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
---
libselinux/src/Makefile | 2 ++
libselinux/src/label_file.c | 63 ++++++++++++++++++++++++---------------------
2 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
index 74e53bb..ac019df 100644
--- a/libselinux/src/Makefile
+++ b/libselinux/src/Makefile
@@ -20,6 +20,8 @@ RUBYINC ?= $(shell pkg-config --cflags ruby-$(RUBYLIBVER))
RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
LIBBASE=$(shell basename $(LIBDIR))
+LDFLAGS ?= -lpcre
+
VERSION = $(shell cat ../VERSION)
LIBVERSION = 1
Minor nit: I think normally it would be added to LDLIBS rather than
LDFLAGS, so maybe add a LDLIBS += -lselinux -lpcre to the Makefile and
then replace all instances of -lselinux with $(LDLIBS).
Only a few days ago, we realized the (rather high) cost of external
dependencies with the incompatibility generated in SELinux userspace by
more recent swig versions (>2.0.4 or something similar).
If the regex functions' speed in glibc is a general issue perhaps it
would be more profitable to import a fix from pcre into glibc ?
If not, perhaps it would at least be possible to add the changes with
conditional selection so that we can keep the existing glibc code as a
fallback option ?
Regards,
Guido
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@xxxxxxxxxxxxx with
the words "unsubscribe selinux" without quotes as the message.