* [PATCH] restorecond: Do not link against libpcre
@ 2019-03-21 10:04 Laurent Bigonville
2019-03-21 12:06 ` Petr Lautrbach
0 siblings, 1 reply; 3+ messages in thread
From: Laurent Bigonville @ 2019-03-21 10:04 UTC (permalink / raw)
To: selinux
From: Laurent Bigonville <bigon@bigon.be>
For some reasons, restorecond was explicitly linking against libpcre but
the code is not using any of its symbols
Closes: https://github.com/SELinuxProject/selinux/issues/137
Signed-off-by: Laurent Bigonville <bigon@bigon.be>
---
restorecond/Makefile | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/restorecond/Makefile b/restorecond/Makefile
index b81f8c82..12452cd2 100644
--- a/restorecond/Makefile
+++ b/restorecond/Makefile
@@ -19,17 +19,7 @@ DBUSLIB = $(shell $(PKG_CONFIG) --libs dbus-glib-1)
CFLAGS ?= -g -Werror -Wall -W
override CFLAGS += $(DBUSFLAGS)
-USE_PCRE2 ?= n
-ifeq ($(USE_PCRE2),y)
- PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 $(shell $(PKG_CONFIG) --cflags libpcre2-8)
- PCRE_LDLIBS := $(shell $(PKG_CONFIG) --libs libpcre2-8)
-else
- PCRE_CFLAGS := $(shell $(PKG_CONFIG) --cflags libpcre)
- PCRE_LDLIBS := $(shell $(PKG_CONFIG) --libs libpcre)
-endif
-export PCRE_CFLAGS PCRE_LDLIBS
-
-override LDLIBS += -lselinux $(PCRE_LDLIBS) $(DBUSLIB)
+override LDLIBS += -lselinux $(DBUSLIB)
all: restorecond
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] restorecond: Do not link against libpcre
2019-03-21 10:04 [PATCH] restorecond: Do not link against libpcre Laurent Bigonville
@ 2019-03-21 12:06 ` Petr Lautrbach
2019-03-26 22:23 ` Nicolas Iooss
0 siblings, 1 reply; 3+ messages in thread
From: Petr Lautrbach @ 2019-03-21 12:06 UTC (permalink / raw)
To: selinux; +Cc: Laurent Bigonville
Laurent Bigonville <bigon@debian.org> writes:
> From: Laurent Bigonville <bigon@bigon.be>
>
> For some reasons, restorecond was explicitly linking against
> libpcre but
> the code is not using any of its symbols
>
> Closes: https://github.com/SELinuxProject/selinux/issues/137
>
> Signed-off-by: Laurent Bigonville <bigon@bigon.be>
It looks likes it was accidentally added by commit
50f0910cf05bdc1d10710c7c3fb748a178473387 ("libselinux: add support
for pcre2")
Acked-by: Petr Lautrbach <plautrba@redhat.com>
> ---
> restorecond/Makefile | 12 +-----------
> 1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/restorecond/Makefile b/restorecond/Makefile
> index b81f8c82..12452cd2 100644
> --- a/restorecond/Makefile
> +++ b/restorecond/Makefile
> @@ -19,17 +19,7 @@ DBUSLIB = $(shell $(PKG_CONFIG) --libs
> dbus-glib-1)
> CFLAGS ?= -g -Werror -Wall -W
> override CFLAGS += $(DBUSFLAGS)
>
> -USE_PCRE2 ?= n
> -ifeq ($(USE_PCRE2),y)
> - PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8
> $(shell $(PKG_CONFIG) --cflags libpcre2-8)
> - PCRE_LDLIBS := $(shell $(PKG_CONFIG) --libs libpcre2-8)
> -else
> - PCRE_CFLAGS := $(shell $(PKG_CONFIG) --cflags libpcre)
> - PCRE_LDLIBS := $(shell $(PKG_CONFIG) --libs libpcre)
> -endif
> -export PCRE_CFLAGS PCRE_LDLIBS
> -
> -override LDLIBS += -lselinux $(PCRE_LDLIBS) $(DBUSLIB)
> +override LDLIBS += -lselinux $(DBUSLIB)
>
> all: restorecond
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] restorecond: Do not link against libpcre
2019-03-21 12:06 ` Petr Lautrbach
@ 2019-03-26 22:23 ` Nicolas Iooss
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Iooss @ 2019-03-26 22:23 UTC (permalink / raw)
To: Petr Lautrbach, Laurent Bigonville; +Cc: selinux
On Thu, Mar 21, 2019 at 1:06 PM Petr Lautrbach <plautrba@redhat.com> wrote:
>
>
> Laurent Bigonville <bigon@debian.org> writes:
>
> > From: Laurent Bigonville <bigon@bigon.be>
> >
> > For some reasons, restorecond was explicitly linking against
> > libpcre but
> > the code is not using any of its symbols
> >
> > Closes: https://github.com/SELinuxProject/selinux/issues/137
> >
> > Signed-off-by: Laurent Bigonville <bigon@bigon.be>
>
> It looks likes it was accidentally added by commit
> 50f0910cf05bdc1d10710c7c3fb748a178473387 ("libselinux: add support
> for pcre2")
>
>
> Acked-by: Petr Lautrbach <plautrba@redhat.com>
Merged, Thanks.
Nicolas
> > ---
> > restorecond/Makefile | 12 +-----------
> > 1 file changed, 1 insertion(+), 11 deletions(-)
> >
> > diff --git a/restorecond/Makefile b/restorecond/Makefile
> > index b81f8c82..12452cd2 100644
> > --- a/restorecond/Makefile
> > +++ b/restorecond/Makefile
> > @@ -19,17 +19,7 @@ DBUSLIB = $(shell $(PKG_CONFIG) --libs
> > dbus-glib-1)
> > CFLAGS ?= -g -Werror -Wall -W
> > override CFLAGS += $(DBUSFLAGS)
> >
> > -USE_PCRE2 ?= n
> > -ifeq ($(USE_PCRE2),y)
> > - PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8
> > $(shell $(PKG_CONFIG) --cflags libpcre2-8)
> > - PCRE_LDLIBS := $(shell $(PKG_CONFIG) --libs libpcre2-8)
> > -else
> > - PCRE_CFLAGS := $(shell $(PKG_CONFIG) --cflags libpcre)
> > - PCRE_LDLIBS := $(shell $(PKG_CONFIG) --libs libpcre)
> > -endif
> > -export PCRE_CFLAGS PCRE_LDLIBS
> > -
> > -override LDLIBS += -lselinux $(PCRE_LDLIBS) $(DBUSLIB)
> > +override LDLIBS += -lselinux $(DBUSLIB)
> >
> > all: restorecond
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-03-26 22:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-21 10:04 [PATCH] restorecond: Do not link against libpcre Laurent Bigonville
2019-03-21 12:06 ` Petr Lautrbach
2019-03-26 22:23 ` Nicolas Iooss
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.