Browse Source

lua-lzlib: fix build failure, honor cflags, cleanup

* fix failure on buildbot where lua devel files are searched in home directory
 * add a patch to pass proper target optimization flags
 * remove unused PKG_INSTALL & Build/Install

Signed-off-by: Nicolas Thill <nico@openwrt.org>
lilik-openwrt-22.03
Nicolas Thill 10 years ago
parent
commit
201aa65a56
2 changed files with 16 additions and 5 deletions
  1. +4
    -5
      lang/lua-lzlib/Makefile
  2. +12
    -0
      lang/lua-lzlib/patches/001-allow_optim_flags.patch

+ 4
- 5
lang/lua-lzlib/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lua-lzlib
PKG_VERSION:=0.4.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
PKG_LICENSE:=MIT
@ -19,8 +19,6 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=9fa3993bb4504fbbc10511cde141e1c6a48c072d
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/lua-lzlib
@ -36,8 +34,9 @@ define Package/lua-lzlib/description
A library to access zlib library functions and also to read/write gzip files using an interface similar to the base io package.
endef
define Build/Install
endef
MAKE_FLAGS += \
LUA="$(STAGING_DIR)/usr" \
OFLAGS="$(TARGET_CFLAGS)" \
define Package/lua-lzlib/install
$(INSTALL_DIR) $(1)/usr/lib/lua


+ 12
- 0
lang/lua-lzlib/patches/001-allow_optim_flags.patch View File

@ -0,0 +1,12 @@
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,8 @@ LUABIN= $(LUA)/bin
ZLIB=../zlib-1.2.3
# no need to change anything below here
-CFLAGS= $(INCS) $(DEFS) $(WARN) -O0 -fPIC
+CFLAGS= $(INCS) $(DEFS) $(WARN) $(OFLAGS) -fPIC
+OFLAGS= -O0
WARN= -g -Werror -Wall -pedantic #-ansi
INCS= -I$(LUAINC) -I$(ZLIB)
LIBS= -L$(ZLIB) -lz -L$(LUALIB) -L$(LUABIN) #-llua51

Loading…
Cancel
Save