mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 00:14:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from trunk rev 2037:

Browse source 
The m4 shipped to handle Python was incorrectly clearing
$CPPFLAGS. Additionally, do not repeat compiler flags for automake
targets that already include them, and pass more flags to the Perl build.

Signed-off-by: Kees Cook <kees@ubuntu.com>
Acked-By: Steve Beattie <sbeattie@ubuntu.com>
This commit is contained in:
Kees Cook 2012-04-25 12:58:58 -07:00
parent 8c6e3a9724
commit cac95f10ce
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/libapparmor/m4/ac_python_devel.m4
View file

@ -158,6 +158,8 @@ $ac_distutils_result])
AC_MSG_CHECKING([consistency of all components of python development environment]) AC_MSG_CHECKING([consistency of all components of python development environment])
AC_LANG_PUSH([C]) AC_LANG_PUSH([C])
# save current global flags # save current global flags
ac_save_LIBS="$LIBS"
ac_save_CPPFLAGS="$CPPFLAGS"
LIBS="$ac_save_LIBS $PYTHON_LDFLAGS" LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([

3
libraries/libapparmor/src/Makefile.am
View file

@ -3,7 +3,8 @@ INCLUDES = $(all_includes)
BUILT_SOURCES = grammar.h scanner.h af_protos.h BUILT_SOURCES = grammar.h scanner.h af_protos.h
AM_LFLAGS = -v AM_LFLAGS = -v
AM_YFLAGS = -d -p aalogparse_ AM_YFLAGS = -d -p aalogparse_
AM_CFLAGS = @CFLAGS@ -D_GNU_SOURCE -Wall AM_CFLAGS = -Wall
AM_CPPFLAGS = -D_GNU_SOURCE
scanner.h: scanner.l scanner.h: scanner.l
$(LEX) -v $< $(LEX) -v $<

2
libraries/libapparmor/swig/perl/Makefile.PL.in
View file

@ -10,7 +10,7 @@ WriteMakefile(
'FIRST_MAKEFILE' => 'Makefile.perl', 'FIRST_MAKEFILE' => 'Makefile.perl',
'ABSTRACT' => q[Perl interface to AppArmor] , 'ABSTRACT' => q[Perl interface to AppArmor] ,
'VERSION' => q[@VERSION@], 'VERSION' => q[@VERSION@],
'INC' => q[-I@top_srcdir@/src @CFLAGS@], 'INC' => q[@CPPFLAGS@ -I@top_srcdir@/src @CFLAGS@],
'LIBS' => q[-L@top_builddir@/src/.libs/ -lapparmor @LIBS@], 'LIBS' => q[-L@top_builddir@/src/.libs/ -lapparmor @LIBS@],
'OBJECT' => 'libapparmor_wrap.o', # $(OBJ_EXT) 'OBJECT' => 'libapparmor_wrap.o', # $(OBJ_EXT)
) ; ) ;

3
libraries/libapparmor/testsuite/Makefile.am
View file

@ -10,8 +10,7 @@ AM_CFLAGS = -Wall
noinst_PROGRAMS = test_multi.multi noinst_PROGRAMS = test_multi.multi
test_multi_multi_SOURCES = test_multi.c test_multi_multi_SOURCES = test_multi.c
test_multi_multi_CFLAGS = $(CFLAGS) -Wall test_multi_multi_CFLAGS = -Wall
test_multi_multi_LDFLAGS = $(LDFLAGS)
test_multi_multi_LDADD = -L../src/.libs -lapparmor test_multi_multi_LDADD = -L../src/.libs -lapparmor
clean-local: clean-local: