From 7059f94769a6cdf318a7aa173b9730a0e229b1e6 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 1 Apr 2019 21:32:32 -0700
Subject: [PATCH 1/3] luasec: Replace -fPIC with $(FPIC)

Currently i386 and the PPC targets have issues linking issues.

https://github.com/openwrt/packages/issues/3319

says that replacing -fPIC with -fpic works.

Patch added to avoid package overriding settings set by toolchain and make
compilation less noisy

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from cf23dd2eb0944a9a64ecec37344d04bc0c66eb4e)
---
 lang/luasec/Makefile                          |  5 ++++-
 lang/luasec/patches/100-fix-compilation.patch | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 lang/luasec/patches/100-fix-compilation.patch

diff --git a/lang/luasec/Makefile b/lang/luasec/Makefile
index 4bf05acc9..71969a14b 100644
--- a/lang/luasec/Makefile
+++ b/lang/luasec/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luasec
 PKG_VERSION:=0.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/brunoos/luasec/archive/
@@ -40,6 +40,9 @@ endef
 define Build/Configure
 endef
 
+TARGET_CFLAGS += $(FPIC)
+TARGET_LDFLAGS += $(FPIC)
+
 MAKE_FLAGS += \
 	INCDIR="$(TARGET_CPPFLAGS) -I." \
 	LIBDIR="$(TARGET_LDFLAGS) -L./luasocket" \
diff --git a/lang/luasec/patches/100-fix-compilation.patch b/lang/luasec/patches/100-fix-compilation.patch
new file mode 100644
index 000000000..d668c05ec
--- /dev/null
+++ b/lang/luasec/patches/100-fix-compilation.patch
@@ -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)

From bbfd71a5985a61528ccc22c13174e69e14bba9f8 Mon Sep 17 00:00:00 2001
From: Eneas U de Queiroz <cote2004-github@yahoo.com>
Date: Wed, 3 Apr 2019 14:43:10 -0300
Subject: [PATCH 2/3] luasec: use gcc to link instead of ld

Linking with ld is not portable and was causing problems for some
targets, e.g. i386_pentium4:
i486-openwrt-linux-musl-ld: x509.o: in function `push_asn1_objname':
x509.c:(.text+0x61): undefined reference to `__stack_chk_fail_local'
...

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from e3f1532297bdc0fb1fb9bacd1a51405753d332f9)
---
 lang/luasec/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lang/luasec/Makefile b/lang/luasec/Makefile
index 71969a14b..026a99d42 100644
--- a/lang/luasec/Makefile
+++ b/lang/luasec/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luasec
 PKG_VERSION:=0.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/brunoos/luasec/archive/
@@ -44,6 +44,7 @@ TARGET_CFLAGS += $(FPIC)
 TARGET_LDFLAGS += $(FPIC)
 
 MAKE_FLAGS += \
+	LD="$(TARGET_CC)" \
 	INCDIR="$(TARGET_CPPFLAGS) -I." \
 	LIBDIR="$(TARGET_LDFLAGS) -L./luasocket" \
 	LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \

From 9f74ef0f896336099d4c6327302ecd216b8e3ded Mon Sep 17 00:00:00 2001
From: Eneas U de Queiroz <cote2004-github@yahoo.com>
Date: Wed, 3 Apr 2019 17:58:56 -0300
Subject: [PATCH 3/3] luasec: cleanup Makefile

The LIBDIR and INCDIR assignments are duplicate of the original
Makefile, changing LIB_PATH and INC_PATH to LDFLAGS and CPPFLAGS.

Setting LIB_PATH and INC_PATH to empty strings will do the same
without duplicating the flags.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
---
 lang/luasec/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/luasec/Makefile b/lang/luasec/Makefile
index 026a99d42..2465b1fa4 100644
--- a/lang/luasec/Makefile
+++ b/lang/luasec/Makefile
@@ -45,8 +45,8 @@ TARGET_LDFLAGS += $(FPIC)
 
 MAKE_FLAGS += \
 	LD="$(TARGET_CC)" \
-	INCDIR="$(TARGET_CPPFLAGS) -I." \
-	LIBDIR="$(TARGET_LDFLAGS) -L./luasocket" \
+	INC_PATH="" \
+	LIB_PATH="" \
 	LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
 	LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua"