From 0db4553ac9a69571fcf66bb4b79c94f374dcc834 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 9 Sep 2022 17:44:27 -0700 Subject: [PATCH] liboil: small cleanups Fixes a compile error when glib2 is missing. get rid of nls.mk. iconv/gettext is not used. This was previously here because of glib2. Signed-off-by: Rosen Penev --- libs/liboil/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/liboil/Makefile b/libs/liboil/Makefile index ba2cf87fe2..a8ef2c4993 100644 --- a/libs/liboil/Makefile +++ b/libs/liboil/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liboil PKG_VERSION:=0.3.17 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/ @@ -20,9 +20,9 @@ PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk define Package/liboil SECTION:=libs @@ -30,7 +30,7 @@ define Package/liboil TITLE:=simple functions optimized for various CPUs URL:=http://liboil.freedesktop.org/wiki/ MAINTAINER:=W. Michael Petullo - DEPENDS:=+librt $(ICONV_DEPENDS) $(INTL_DEPENDS) + DEPENDS:=+librt endef define Package/liboil/description @@ -43,10 +43,10 @@ define Package/liboil/description endef CONFIGURE_ARGS += \ + --with-pic \ --enable-shared \ --enable-static \ - -TARGET_CFLAGS += $(FPIC) $(if $(ICONV_FULL),-liconv) $(if $(INTL_FULL),-lintl) + --disable-glib # XXX: VFP_CFLAGS is set to '-mfpu=vfp' on arm by configure, but that breaks # final linking stages, so override it until we find why