lua-eco: update to 3.4.0

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
This commit is contained in:
Jianhui Zhao 2024-04-22 09:18:26 +08:00 committed by Tianling Shen
parent e4e861e08d
commit 99bc6b2782
2 changed files with 2 additions and 64 deletions

View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=lua-eco
PKG_VERSION:=3.3.0
PKG_VERSION:=3.4.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL=https://github.com/zhaojh329/lua-eco/releases/download/v$(PKG_VERSION)
PKG_HASH:=597c3edbb20c35f638b26b4fa7a02638c48f96f0330758a7ac1c44079b2170a3
PKG_HASH:=c45c21c4531f6205f775865da1587fb6185705308b67834ac6f7990e83f482ec
PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
PKG_LICENSE:=MIT

View File

@ -1,62 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 14 Apr 2024 17:13:17 +0200
Subject: Support POSIX basename() from musl libc
Musl libc 1.2.5 removed the definition of the basename() function from
string.h and only provides it in libgen.h as the POSIX standard
defines it.
This change fixes compilation with musl libc 1.2.5.
````
/build_dir/target-mips_24kc_musl/lua-eco-3.3.0/log/log.c: In function '___log':
/build_dir/target-mips_24kc_musl/lua-eco-3.3.0/log/log.c:76:24: error: implicit declaration of function 'basename' [-Werror=implicit-function-declaration]
76 | filename = basename(filename);
| ^~~~~~~~
/build_dir/target-mips_24kc_musl/lua-eco-3.3.0/log/log.c:76:22: error: assignment to 'const char *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
76 | filename = basename(filename);
| ^
````
basename() modifies the input string, copy it first with strdup(), If
strdup() returns NULL the code will handle it.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
log/log.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- a/log/log.c
+++ b/log/log.c
@@ -9,6 +9,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
+#include <libgen.h>
#include "log.h"
@@ -65,6 +66,7 @@ void ___log(const char *filename, int li
{
char new_fmt[256];
va_list ap;
+ char *dirc = NULL;
priority = LOG_PRI(priority);
@@ -72,9 +74,13 @@ void ___log(const char *filename, int li
return;
if (__log_flags__ & LOG_FLAG_FILE || __log_flags__ & LOG_FLAG_PATH) {
- if (!(__log_flags__ & LOG_FLAG_PATH))
- filename = basename(filename);
+ if (!(__log_flags__ & LOG_FLAG_PATH)) {
+ dirc = strdup(filename);
+ filename = basename(dirc);
+ }
snprintf(new_fmt, sizeof(new_fmt), "(%s:%3d) %s", filename, line, fmt);
+ if (!(__log_flags__ & LOG_FLAG_PATH))
+ free(dirc);
} else {
snprintf(new_fmt, sizeof(new_fmt), "%s", fmt);
}