fix build of luacurl with older gcc using curl-7.63.0

diff --git a/archive-patches/lua-curl_forward_typedef.patch b/archive-patches/lua-curl_forward_typedef.patch
new file mode 100644 (file)
index 0000000..84ee29a
--- /dev/null
+++ b/archive-patches/lua-curl_forward_typedef.patch
@@ -0,0 +1,16 @@
+#
+# need for non default c++11 in gcc-4.9
+#
+--- a/src/lcutils.h
++++ b/src/lcutils.h
+@@ -21,6 +21,10 @@
+ #  endif
+ #endif
+ 
++#if __GNUC_PREREQ(4,9)
++#  define LCURL_CC_SUPPORT_FORWARD_TYPEDEF 1
++#endif
++
+ #ifndef LCURL_CC_SUPPORT_FORWARD_TYPEDEF
+ #  define LCURL_CC_SUPPORT_FORWARD_TYPEDEF 0
+ #endif

diff --git a/make/libraries.mk b/make/libraries.mk
index 315c89fe7201923f4a72bc109ff287881ef4791b..0b3f5d8a8992244876bed29bf25f122a288ecdcc 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -1013,8 +1013,9 @@ $(D)/luacurl: $(D)/libcurl $(ARCHIVE)/Lua-cURL$(LUACURL_VER)-git-$(LUACURL_GIT).
        $(UNTAR)/Lua-cURL$(LUACURL_VER)-git-$(LUACURL_GIT).tar.bz2
        set -e; cd $(BUILD_TMP)/Lua-cURL$(LUACURL_VER)-git-$(LUACURL_GIT); \
                $(PATCH)/lua-curl-Makefile.diff; \
+               $(PATCH)/lua-curl_forward_typedef.patch; \
                $(BUILDENV) \
-                       CC=$(CROSS_DIR)/bin/$(TARGET)-gcc \
+                       CC=$(TARGET)-gcc \
                        LUA_CMOD=/lib/lua/$(LUA_ABIVER) \
                        LUA_LMOD=/share/lua/$(LUA_ABIVER) \
                        LIBDIR=$(TARGETPREFIX)/lib \

diff --git a/make/versions.mk b/make/versions.mk
index 364c13115a6639e8c258cc3f3dad2b156bc1dfd1..3c70d415ac07dbaea2aa5017012b5aeaa24cefff 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -149,7 +149,7 @@ LUA_ABIVER = 5.2
 LUA_VER=$(LUA_ABIVER).4
 
 LUACURL_VER = v3
-LUACURL_GIT = f108886
+LUACURL_GIT = e0b1d2e
 
 LUA_EXPAT_VER = 1.3.0