diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-31 18:16:08 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-06-05 12:33:54 +0200 |
| commit | 82cde019e6b43d954c00eb96b2eaff9040b9ab6e (patch) | |
| tree | e4ff28095e9488657070c5387fe1ccfe7e8abd1c | |
| parent | d53fd8cbb5cffc57a768cc893a7d2652b5f68941 (diff) | |
| download | ptxdist-82cde019e6b43d954c00eb96b2eaff9040b9ab6e.tar.gz ptxdist-82cde019e6b43d954c00eb96b2eaff9040b9ab6e.tar.xz | |
acl: always build and install shared library
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/acl.in | 5 | ||||
| -rw-r--r-- | rules/acl.make | 5 | ||||
| -rw-r--r-- | rules/logrotate.in | 1 | ||||
| -rw-r--r-- | rules/udev.in | 1 |
4 files changed, 2 insertions, 10 deletions
diff --git a/rules/acl.in b/rules/acl.in index 1e427ea77..ca3f79710 100644 --- a/rules/acl.in +++ b/rules/acl.in @@ -17,11 +17,6 @@ config ACL_TOOLS bool prompt "install tools" -config ACL_SHARED - bool - default y - prompt "install shared lib" - config ACL_GETTEXT bool prompt "gettext support" diff --git a/rules/acl.make b/rules/acl.make index f0a06e10e..4ba7fe4f7 100644 --- a/rules/acl.make +++ b/rules/acl.make @@ -47,7 +47,7 @@ ACL_INSTALL_OPT := \ ACL_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --libexecdir=/usr/lib \ - --$(call ptx/endis, PTXCONF_ACL_SHARED)-shared \ + --enable-shared \ --$(call ptx/endis, PTXCONF_ACL_GETTEXT)-gettext # ---------------------------------------------------------------------------- @@ -68,9 +68,8 @@ ifdef PTXCONF_ACL_TOOLS @$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/setfacl) @$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/getfacl) endif -ifdef PTXCONF_ACL_SHARED @$(call install_lib, acl, 0, 0, 0644, libacl) -endif + @$(call install_finish, acl) @$(call touch) diff --git a/rules/logrotate.in b/rules/logrotate.in index 9d23e18b6..202dee573 100644 --- a/rules/logrotate.in +++ b/rules/logrotate.in @@ -5,7 +5,6 @@ menuconfig LOGROTATE prompt "logrotate " select LIBPOPT select ACL if LOGROTATE_ACL - select ACL_SHARED if LOGROTATE_ACL help The logrotate utility is designed to simplify the administration of log files on a system which generates a lot diff --git a/rules/udev.in b/rules/udev.in index 66cf93fd5..c74eaf259 100644 --- a/rules/udev.in +++ b/rules/udev.in @@ -9,7 +9,6 @@ menuconfig UDEV select LIBBLKID if !UDEV_LEGACY select HOST_GPERF if UDEV_KEYMAPS select ACL if UDEV_ACL - select ACL_SHARED if UDEV_ACL select GLIB if UDEV_ACL || UDEV_LIBGUDEV select PCIUTILS if UDEV_PERSISTENT_PCI select USBUTILS if UDEV_PERSISTENT_USB |