diff options
| author | Al Stone <ahs3@redhat.com> | 2013-01-03 13:42:34 -0700 |
|---|---|---|
| committer | Al Stone <ahs3@redhat.com> | 2013-01-03 13:42:34 -0700 |
| commit | 5b9a975032a2e305cac848d2ee1fec9744b4f4ce (patch) | |
| tree | a746cb3837d7ea91f250942c9be3eb3d2dc58985 | |
| parent | 81e39c8a97377e6a75f8f554bb2d3cd3aa314e3d (diff) | |
| parent | 6b75e78bde80a65ffde34cd7523f97687630e681 (diff) | |
| download | bootstrap.git.DONOTUSE-5b9a975032a2e305cac848d2ee1fec9744b4f4ce.tar.gz bootstrap.git.DONOTUSE-5b9a975032a2e305cac848d2ee1fec9744b4f4ce.tar.xz bootstrap.git.DONOTUSE-5b9a975032a2e305cac848d2ee1fec9744b4f4ce.zip | |
Merge branch 'aarch64-ahs3'
| -rw-r--r-- | recipe.d/0101-libsepol | 8 | ||||
| -rw-r--r-- | recipe.d/0102-attr | 6 | ||||
| -rw-r--r-- | recipe.d/0103-acl | 6 | ||||
| -rw-r--r-- | recipe.d/0104-libsemanage | 8 |
4 files changed, 18 insertions, 10 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 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 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 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 |