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 <[email protected]> Index: apparmor-debian/libraries/libapparmor/src/Makefile.am =================================================================== --- apparmor-debian.orig/libraries/libapparmor/src/Makefile.am 2012-04-24 16:43:42.000000000 -0700 +++ apparmor-debian/libraries/libapparmor/src/Makefile.am 2012-04-24 16:45:16.118903253 -0700 @@ -3,7 +3,8 @@ BUILT_SOURCES = grammar.h scanner.h af_protos.h AM_LFLAGS = -v AM_YFLAGS = -d -p aalogparse_ -AM_CFLAGS = @CFLAGS@ -D_GNU_SOURCE -Wall +AM_CFLAGS = -Wall +AM_CPPFLAGS = -D_GNU_SOURCE scanner.h: scanner.l $(LEX) -v $< Index: apparmor-debian/libraries/libapparmor/swig/perl/Makefile.PL.in =================================================================== --- apparmor-debian.orig/libraries/libapparmor/swig/perl/Makefile.PL.in 2012-04-24 16:43:42.000000000 -0700 +++ apparmor-debian/libraries/libapparmor/swig/perl/Makefile.PL.in 2012-04-24 16:45:16.118903253 -0700 @@ -10,7 +10,7 @@ 'FIRST_MAKEFILE' => 'Makefile.perl', 'ABSTRACT' => q[Perl interface to AppArmor] , '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@], 'OBJECT' => 'libapparmor_wrap.o', # $(OBJ_EXT) ) ; Index: apparmor-debian/libraries/libapparmor/m4/ac_python_devel.m4 =================================================================== --- apparmor-debian.orig/libraries/libapparmor/m4/ac_python_devel.m4 2012-04-24 16:43:42.000000000 -0700 +++ apparmor-debian/libraries/libapparmor/m4/ac_python_devel.m4 2012-04-24 16:45:16.118903253 -0700 @@ -158,6 +158,8 @@ AC_MSG_CHECKING([consistency of all components of python development environment]) AC_LANG_PUSH([C]) # save current global flags + ac_save_LIBS="$LIBS" + ac_save_CPPFLAGS="$CPPFLAGS" LIBS="$ac_save_LIBS $PYTHON_LDFLAGS" CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" AC_TRY_LINK([ Index: apparmor-debian/libraries/libapparmor/testsuite/Makefile.am =================================================================== --- apparmor-debian.orig/libraries/libapparmor/testsuite/Makefile.am 2011-01-05 14:41:11.000000000 -0800 +++ apparmor-debian/libraries/libapparmor/testsuite/Makefile.am 2012-04-24 16:45:35.779199351 -0700 @@ -10,8 +10,7 @@ noinst_PROGRAMS = test_multi.multi test_multi_multi_SOURCES = test_multi.c -test_multi_multi_CFLAGS = $(CFLAGS) -Wall -test_multi_multi_LDFLAGS = $(LDFLAGS) +test_multi_multi_CFLAGS = -Wall test_multi_multi_LDADD = -L../src/.libs -lapparmor clean-local: -- Kees Cook -- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
