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 <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2022-09-09 17:44:27 -07:00
parent 7dbf3f41c5
commit 0db4553ac9
1 changed files with 5 additions and 5 deletions

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=liboil PKG_NAME:=liboil
PKG_VERSION:=0.3.17 PKG_VERSION:=0.3.17
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/ PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/
@ -20,9 +20,9 @@ PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/liboil define Package/liboil
SECTION:=libs SECTION:=libs
@ -30,7 +30,7 @@ define Package/liboil
TITLE:=simple functions optimized for various CPUs TITLE:=simple functions optimized for various CPUs
URL:=http://liboil.freedesktop.org/wiki/ URL:=http://liboil.freedesktop.org/wiki/
MAINTAINER:=W. Michael Petullo <mike@flyn.org> MAINTAINER:=W. Michael Petullo <mike@flyn.org>
DEPENDS:=+librt $(ICONV_DEPENDS) $(INTL_DEPENDS) DEPENDS:=+librt
endef endef
define Package/liboil/description define Package/liboil/description
@ -43,10 +43,10 @@ define Package/liboil/description
endef endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--with-pic \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--disable-glib
TARGET_CFLAGS += $(FPIC) $(if $(ICONV_FULL),-liconv) $(if $(INTL_FULL),-lintl)
# XXX: VFP_CFLAGS is set to '-mfpu=vfp' on arm by configure, but that breaks # 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 # final linking stages, so override it until we find why