iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
package/civetweb/0001-modlua.ini-include-dlfcn.h.patch
View File

@@ -1,34 +0,0 @@
From ca4325c6963e505d6fb628163abf2359427ea022 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 29 Nov 2018 21:43:28 +0100
Subject: [PATCH] modlua.ini: include dlfcn.h
dlfcn.h must be included to be able to use dlopen otherwise build will
fail on:
src/mod_lua.inl:2845:41: error: 'RTLD_LAZY' undeclared (first use in this function)
lib_handle_uuid = dlopen("libuuid.so", RTLD_LAZY);
Fixes:
- http://autobuild.buildroot.org/results/7a189f49c5a8b6f7b3d4c57cda5982adc65dbc19
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/civetweb/civetweb/pull/706]
---
src/mod_lua.inl | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mod_lua.inl b/src/mod_lua.inl
index 97a5de1e..ce7a4b2e 100644
--- a/src/mod_lua.inl
+++ b/src/mod_lua.inl
@@ -2,6 +2,7 @@
* See https://github.com/civetweb/civetweb/
*/
+#include <dlfcn.h>
#include "civetweb_lua.h"
#include "civetweb_private_lua.h"
--
2.14.1

4
package/civetweb/civetweb.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated
sha256 de7d5e7a2d9551d325898c71e41d437d5f7b51e754b242af897f7be96e713a42 civetweb-1.11.tar.gz
sha256 1cd00da00b8649b4005757f4019acfd3102ecd407f47998081697e8e9086f706 LICENSE.md
sha256 a7ccc76c2f1b5f4e8d855eb328ed542f8fe3b882a6da868781799a98f4acdedc civetweb-1.13.tar.gz
sha256 291622dfbbf4fb35829726fbe97177b7227c0d4d6392b350660af73af4f86df8 LICENSE.md

9
package/civetweb/civetweb.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
CIVETWEB_VERSION = 1.11
CIVETWEB_VERSION = 1.13
CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION))
CIVETWEB_LICENSE = MIT
CIVETWEB_LICENSE_FILES = LICENSE.md
@@ -38,6 +38,12 @@ else
CIVETWEB_COPT += -DNO_SSL
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
CIVETWEB_CONF_OPTS += WITH_ZLIB=1
CIVETWEB_LIBS += -lz
CIVETWEB_DEPENDENCIES += zlib
endif
ifeq ($(BR2_PACKAGE_CIVETWEB_SERVER),y)
CIVETWEB_BUILD_TARGETS += build
CIVETWEB_INSTALL_TARGETS += install
@@ -55,7 +61,6 @@ endif
ifeq ($(BR2_SHARED_LIBS)$(BR2_STATIC_SHARED_LIBS),y)
CIVETWEB_BUILD_TARGETS += slib
CIVETWEB_INSTALL_TARGETS += install-slib
CIVETWEB_COPT += -fPIC
endif
endif # BR2_PACKAGE_CIVETWEB_LIB