lxc: cleanup Makefile and outdated configure options
authorRosen Penev <rosenp@gmail.com>
Wed, 20 May 2020 23:28:05 +0000 (16:28 -0700)
committerRosen Penev <rosenp@gmail.com>
Fri, 22 May 2020 21:02:25 +0000 (14:02 -0700)
Added PKG_NO_MIPS16 as MIPS16 is no longer supported.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
utils/lxc/Makefile

index 1d69a21cef7fb702305604af0819e9678a887a84..acb827f8b635c1a7036ba3dae516b47c31403b7c 100644 (file)
@@ -16,13 +16,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/
 PKG_HASH:=ca336dcdf303fea5ff231d89a9b6278b061c4cffb14f0db0a71a15bdd95a5cb0
 
-PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0
 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
+PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0
 
-PKG_BUILD_PARALLEL:=1
-
-PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -134,23 +134,19 @@ define Package/lxc-init
 endef
 
 CONFIGURE_ARGS += \
-       --disable-apparmor \
-       --disable-cgmanager \
+       --disable-werror \
+       --disable-rpath \
        --disable-doc \
-       --disable-examples \
-       --disable-gnutls \
+       --disable-api-docs \
+       --disable-apparmor \
        --disable-selinux \
-       --disable-python
+       --$(if $(CONFIG_LXC_SECCOMP),en,dis)able-seccomp \
+       --enable-capabilities \
+       --disable-examples
 
-TARGET_CFLAGS += -Wno-format-nonliteral
+TARGET_CFLAGS += -minterlink-mips16
 TARGET_LDFLAGS += -lgcc_eh
 
-ifeq ($(CONFIG_LXC_SECCOMP),y)
-CONFIGURE_ARGS += --enable-seccomp
-else
-CONFIGURE_ARGS += --disable-seccomp
-endif
-
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/lxc/
        $(CP) \