From patchwork Wed Nov 7 05:57:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Apache2: Add libselinux dependency and Disable parallel install Date: Wed, 07 Nov 2012 05:57:45 -0000 From: rongqing.li@windriver.com X-Patchwork-Id: 38813 Message-Id: <1352267865-3534-1-git-send-email-rongqing.li@windriver.com> To: From: Roy.Li 1. Add conditional dependency on libselinux to apache2. 2. Disable parallel make install apache2 supports parallel make install, before installation, it will firstly call build/mkdir.sh to create needed directories. build/mkdir.sh first checks if a directory exists or not, if not, it will create this directory, when mkdir.sh is called by many instances parallel, it will introduce race, namely the result of checking says one directory does not exist, but when it tries to mkdir, this directory has been created by other instance. Signed-off-by: Roy.Li --- .../recipes-httpd/apache2/apache2_2.4.2.bb | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb index af7840d..c484a19 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb @@ -52,6 +52,12 @@ EXTRA_OECONF = "--enable-ssl \ --enable-mpms-shared \ ac_cv_have_threadsafe_pollset=no" +PARALLEL_MAKEINST = "" + +PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG[selinux] = "ac_cv_lib_selinux_is_selinux_enabled=yes, \ + ac_cv_lib_selinux_is_selinux_enabled=no, libselinux," + do_configure_prepend() { # FIXME: this hack is required to work around an issue with apr/apr-util # Can be removed when fixed in OE-Core (also revert --with-* options above)