libsepol/utils: Fix build without system sepol.h

Commit Message

Petr Lautrbach May 5, 2017, 10:12 a.m. UTC

fcb5d5c removed ../include from CFLAGS from libsepol/utils/Makefile so
that a build tool can't find sepol/sepol.h when only libsepol is built
and a system is without sepol.h in standard paths. It should use its own
sepol.h file during build. `oveeride` needs to be used in order not to
be overridden by values provided on a command line. Same problem applies
to LDFLAGS.

Fixes:
$ make CFLAGS="" LDFLAGS=""
make[1]: Entering directory '/root/selinux/libsepol/utils'
cc     chkcon.c  -lsepol -o chkcon
chkcon.c:1:25: fatal error: sepol/sepol.h: No such file or directory
 #include <sepol/sepol.h>

$ make CFLAGS="" LDFLAGS=""
...
make -C utils
make[1]: Entering directory '/root/selinux/libsepol/utils'
cc  -I../include    chkcon.c  -lsepol -o chkcon
/usr/bin/ld: cannot find -lsepol
collect2: error: ld returned 1 exit status

Signed-off-by: Petr Lautrbach <[e-mail]>
---
 libsepol/utils/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Stephen Smalley May 5, 2017, 7:53 p.m. UTC | #1

On Fri, 2017-05-05 at 12:12 +0200, Petr Lautrbach wrote:
> fcb5d5c removed ../include from CFLAGS from libsepol/utils/Makefile
> so
> that a build tool can't find sepol/sepol.h when only libsepol is
> built
> and a system is without sepol.h in standard paths. It should use its
> own
> sepol.h file during build. `oveeride` needs to be used in order not
> to
> be overridden by values provided on a command line. Same problem
> applies
> to LDFLAGS.
> 
> Fixes:
> $ make CFLAGS="" LDFLAGS=""
> make[1]: Entering directory '/root/selinux/libsepol/utils'
> cc     chkcon.c  -lsepol -o chkcon
> chkcon.c:1:25: fatal error: sepol/sepol.h: No such file or directory
>  #include <sepol/sepol.h>
> 
> $ make CFLAGS="" LDFLAGS=""
> ...
> make -C utils
> make[1]: Entering directory '/root/selinux/libsepol/utils'
> cc  -I../include    chkcon.c  -lsepol -o chkcon
> /usr/bin/ld: cannot find -lsepol
> collect2: error: ld returned 1 exit status

Thanks, applied

> 
> Signed-off-by: Petr Lautrbach <[e-mail]>
> ---
>  libsepol/utils/Makefile | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libsepol/utils/Makefile b/libsepol/utils/Makefile
> index a13164e1..3b2fb771 100644
> --- a/libsepol/utils/Makefile
> +++ b/libsepol/utils/Makefile
> @@ -3,7 +3,8 @@ PREFIX ?= $(DESTDIR)/usr
>  BINDIR ?= $(PREFIX)/bin
>  
>  CFLAGS ?= -Wall -Werror
> -LDFLAGS += -L../src
> +override CFLAGS += -I../include
> +override LDFLAGS += -L../src
>  LDLIBS += -lsepol
>  
>  TARGETS=$(patsubst %.c,%,$(wildcard *.c))

Patch

diff --git a/libsepol/utils/Makefile b/libsepol/utils/Makefile
index a13164e1..3b2fb771 100644
--- a/libsepol/utils/Makefile
+++ b/libsepol/utils/Makefile
@@ -3,7 +3,8 @@  PREFIX ?= $(DESTDIR)/usr
 BINDIR ?= $(PREFIX)/bin
 
 CFLAGS ?= -Wall -Werror
-LDFLAGS += -L../src
+override CFLAGS += -I../include
+override LDFLAGS += -L../src
 LDLIBS += -lsepol
 
 TARGETS=$(patsubst %.c,%,$(wildcard *.c))