From 21a24a53c4620e76a53a1b547fee60cad6d39a9d Mon Sep 17 00:00:00 2001 From: Al Stone Date: Thu, 3 Jan 2013 11:29:13 -0700 Subject: correct paths for installing libsepol Signed-off-by: Al Stone --- recipe.d/0101-libsepol | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe.d/0101-libsepol b/recipe.d/0101-libsepol index 831a93a..4104d88 100644 --- a/recipe.d/0101-libsepol +++ b/recipe.d/0101-libsepol @@ -1,5 +1,9 @@ mcd $BUILDDIR/libsepol rsync -av $SRC/libsepol-*/ ./ -make CC=gcc $J -make CC=gcc $J install +# TARGET is exported by local.conf and passed on make cmdline in stage2 +# script. This overrides the definition in the libsepol Makefile, so +# we need to override again on the make cmdline here. + +make TARGET=libsepol.so CC=gcc $J +make TARGET=libsepol.so CC=gcc $J LIBDIR=/usr/lib${SUFFIX} SHLIBDIR=/lib${SUFFIX} install -- cgit From 622fb8ee2dffe7fa1d361f857fb5c9e70f9f70f5 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Thu, 3 Jan 2013 12:01:03 -0700 Subject: use proper shell for attr install steps Signed-off-by: Al Stone --- recipe.d/0102-attr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe.d/0102-attr b/recipe.d/0102-attr index 61744f2..2f1ab19 100644 --- a/recipe.d/0102-attr +++ b/recipe.d/0102-attr @@ -5,6 +5,6 @@ mcd $BUILDDIR/attr rsync -av $SRC/attr-*/ ./ ./configure $TCONFIGARGS --libexecdir=/usr/lib${SUFFIX} make $J LIBTOOL="libtool --tag=CC" -make $J install -make $J install-dev -make $J install-lib +make $J install SHELL=/bin/bash +make $J install-dev SHELL=/bin/bash +make $J install-lib SHELL=/bin/bash -- cgit From 43adb1992f9a467bb23f017c0afc26861f66b7d7 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Thu, 3 Jan 2013 13:03:59 -0700 Subject: corrected paths for tools for acl build Signed-off-by: Al Stone --- recipe.d/0103-acl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe.d/0103-acl b/recipe.d/0103-acl index 08959fe..a902c25 100644 --- a/recipe.d/0103-acl +++ b/recipe.d/0103-acl @@ -7,6 +7,6 @@ rsync -av $SRC/acl-*/ ./ touch .census ./configure $TCONFIGARGS --libexecdir=/usr/lib${SUFFIX} make $J LIBTOOL="libtool --tag=CC" -make $J install -make $J install-dev -make $J install-lib +make $J install SHELL=/bin/bash +make $J install-dev SHELL=/bin/bash +make $J install-lib SHELL=/bin/bash -- cgit From 6b75e78bde80a65ffde34cd7523f97687630e681 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Thu, 3 Jan 2013 13:42:11 -0700 Subject: correct paths for build for libsemanage Signed-off-by: Al Stone --- recipe.d/0104-libsemanage | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe.d/0104-libsemanage b/recipe.d/0104-libsemanage index c774e97..2da9471 100644 --- a/recipe.d/0104-libsemanage +++ b/recipe.d/0104-libsemanage @@ -6,5 +6,9 @@ mcd $BUILDDIR/libsemanage rsync -av $SRC/libsemanage-*/ ./ -make $J -make $J install +# TARGET is exported by local.conf and passed on make cmdline in stage2 +# script. This overrides the definition in the libsemanage Makefile, so +# we need to override again on the make cmdline here. + +make TARGET=libsemanage.so CC=gcc $J +make TARGET=libsemanage.so CC=gcc $J LIBDIR=/usr/lib${SUFFIX} SHLIBDIR=/lib${SUFFIX} install -- cgit