summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-05-12 09:09:56 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-05-17 08:16:18 +0200
commit7c1401da7d3968501f6ef3a420d4428d3e22994f (patch)
tree66e07ee33117968eefd7b4bf1bb740733fa72c7a /rules
parent15a0d57d5004696c6e4a922a42bc408339ab2a12 (diff)
downloadptxdist-7c1401da7d3968501f6ef3a420d4428d3e22994f.tar.gz
ptxdist-7c1401da7d3968501f6ef3a420d4428d3e22994f.tar.xz
attr: always build the shared library
Disabling it is broken and should not be used anyways. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r--rules/attr.in6
-rw-r--r--rules/attr.make6
-rw-r--r--rules/libcap.in1
3 files changed, 2 insertions, 11 deletions
diff --git a/rules/attr.in b/rules/attr.in
index d7b961de2..5e973b955 100644
--- a/rules/attr.in
+++ b/rules/attr.in
@@ -18,12 +18,6 @@ config ATTR_TOOLS
bool
prompt "install tools"
-config ATTR_SHARED
- bool
- depends on ATTR
- default y
- prompt "install shared lib"
-
config ATTR_GETTEXT
bool
depends on ATTR
diff --git a/rules/attr.make b/rules/attr.make
index ff619bd3b..0461c2d6a 100644
--- a/rules/attr.make
+++ b/rules/attr.make
@@ -51,7 +51,7 @@ ATTR_INSTALL_OPT := \
ATTR_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
--libexecdir=/usr/lib \
- --$(call ptx/endis, PTXCONF_ATTR_SHARED)-shared \
+ --enable-shared \
--$(call ptx/endis, PTXCONF_ATTR_GETTEXT)-gettext
# ----------------------------------------------------------------------------
@@ -72,10 +72,8 @@ ifdef PTXCONF_ATTR_TOOLS
@$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/setfattr)
@$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/getfattr)
endif
-
-ifdef PTXCONF_ATTR_SHARED
@$(call install_lib, attr, 0, 0, 0644, libattr)
-endif
+
@$(call install_finish, attr)
@$(call touch)
diff --git a/rules/libcap.in b/rules/libcap.in
index f7f1fcc60..47febc859 100644
--- a/rules/libcap.in
+++ b/rules/libcap.in
@@ -4,7 +4,6 @@ menuconfig LIBCAP
tristate
prompt "libcap "
select ATTR if LIBCAP_SETCAP
- select ATTR_SHARED if LIBCAP_SETCAP
help
A library for getting and setting POSIX.1e capabilities.