Merge pull request #8776 from neheb/luas

[18.06] luasec: backport build fixes
This commit is contained in:
Rosen Penev 2019-04-24 16:38:58 -07:00 committed by GitHub
commit d018e0946e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luasec PKG_NAME:=luasec
PKG_VERSION:=0.6 PKG_VERSION:=0.6
PKG_RELEASE:=1 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/brunoos/luasec/archive/ PKG_SOURCE_URL:=https://github.com/brunoos/luasec/archive/
@ -40,9 +40,13 @@ endef
define Build/Configure define Build/Configure
endef endef
TARGET_CFLAGS += $(FPIC)
TARGET_LDFLAGS += $(FPIC)
MAKE_FLAGS += \ MAKE_FLAGS += \
INCDIR="$(TARGET_CPPFLAGS) -I." \ LD="$(TARGET_CC)" \
LIBDIR="$(TARGET_LDFLAGS) -L./luasocket" \ INC_PATH="" \
LIB_PATH="" \
LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \ LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua"

View file

@ -0,0 +1,13 @@
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,8 +13,8 @@ WARN=-Wall -pedantic
BSD_CFLAGS=-O2 -fPIC $(WARN) $(INCDIR) $(DEFS)
BSD_LDFLAGS=-O -fPIC -shared $(LIBDIR)
-LNX_CFLAGS=-O2 -fPIC $(WARN) $(INCDIR) $(DEFS)
-LNX_LDFLAGS=-O -fPIC -shared $(LIBDIR)
+LNX_CFLAGS=$(INCDIR) $(DEFS)
+LNX_LDFLAGS=-shared $(LIBDIR)
MAC_ENV=env MACOSX_DEPLOYMENT_TARGET='$(MACVER)'
MAC_CFLAGS=-O2 -fno-common $(WARN) $(INCDIR) $(DEFS)