diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2015-11-25 09:21:08 +0100 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2015-11-26 11:50:45 +0100 |
| commit | 474c3afcff644cca375b2507fb16df27e68d6e62 (patch) | |
| tree | 4e4f9c15e54ea65444d4e811e03d4d1cd4bce4c5 /gnome-base/nautilus/files | |
| parent | gnome-base/libgtop: raise glib dependency to 2.26 per configure (diff) | |
| download | gentoo-474c3afcff644cca375b2507fb16df27e68d6e62.tar.gz gentoo-474c3afcff644cca375b2507fb16df27e68d6e62.tar.bz2 gentoo-474c3afcff644cca375b2507fb16df27e68d6e62.zip | |
gnome-base/nautilus: stop selinux from being automagic
Package-Manager: portage-2.2.25
Diffstat (limited to 'gnome-base/nautilus/files')
| -rw-r--r-- | gnome-base/nautilus/files/nautilus-3.18.2-automagic-selinux.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/gnome-base/nautilus/files/nautilus-3.18.2-automagic-selinux.patch b/gnome-base/nautilus/files/nautilus-3.18.2-automagic-selinux.patch new file mode 100644 index 000000000000..0f769fc339e3 --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-3.18.2-automagic-selinux.patch @@ -0,0 +1,47 @@ +From bfdedc2f762027ec9a50fda659d66720718bb28d Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Wed, 25 Nov 2015 09:23:51 +0100 +Subject: [PATCH] Make libselinux dependency controllable by configure switch + +--- + configure.ac | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 777ff84..37a65ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -140,18 +140,19 @@ dnl ========================================================================== + dnl **************************** + dnl *** Check for libselinux *** + dnl **************************** +- +-SELINUX_LIBS= ++ + msg_selinux=no +-AC_CHECK_LIB(selinux, is_selinux_enabled, +- [AC_CHECK_HEADERS(selinux/selinux.h, +- [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux, +- [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available]) +- SELINUX_LIBS="-lselinux" +- msg_selinux=yes]) +- ]) +- ]) +-AC_SUBST(SELINUX_LIBS) ++ ++AC_ARG_ENABLE([selinux], ++ [AS_HELP_STRING([--enable-selinux], ++ [Enable selinux support])]) ++AS_IF([test "$enable_selinux" != "no"], ++ [PKG_CHECK_MODULES([SELINUX], [libselinux >= 2.0], ++ [ ++ AC_DEFINE([HAVE_SELINUX], [1], [Define to 1 if libselinux is available]) ++ msg_selinux=yes ++ ]) ++ ]) + + + AC_ARG_ENABLE(empty_view, +-- +2.6.3 + |