From 69c42cda625892057c8eea59c2cc784ce191b3e4 Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Mon, 14 Jun 2021 12:31:48 +0900 Subject: [PATCH] mg: bump to 6.9 Signed-off-by: Hirokazu MORIKAWA --- utils/mg/Makefile | 4 ++-- utils/mg/patches/001-cross_compile_openwrt.patch | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/mg/Makefile b/utils/mg/Makefile index b9172dc014..2ccfd0a54d 100644 --- a/utils/mg/Makefile +++ b/utils/mg/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mg -PKG_VERSION:=6.8.1 +PKG_VERSION:=6.9 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ibara/mg/tar.gz/$(PKG_NAME)-$(PKG_VERSION)? -PKG_HASH:=d14c6f3a945d9f5241f20aea8553914ec28d93218e0b091161c122937c56d3e4 +PKG_HASH:=1f5194ceb0062934a6aed12cfb9bfa6d22b7e95069995a7d78cf9bb17e3b4423 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Hirokazu MORIKAWA diff --git a/utils/mg/patches/001-cross_compile_openwrt.patch b/utils/mg/patches/001-cross_compile_openwrt.patch index 756135654a..a32ce2e93b 100644 --- a/utils/mg/patches/001-cross_compile_openwrt.patch +++ b/utils/mg/patches/001-cross_compile_openwrt.patch @@ -89,7 +89,7 @@ # Option variables if [ ! -z "$PREFIX" ] ; then prefix="$PREFIX" -@@ -327,79 +254,9 @@ if [ $static -ne 0 ] ; then +@@ -327,80 +254,9 @@ if [ $static -ne 0 ] ; then ldflags="${ldflags}-static" fi @@ -137,6 +137,7 @@ -case "x$os" in - "xLinux"|"xCYGWIN"*) - cflags="$cflags -D_GNU_SOURCE -D__dead=\"__attribute__((__noreturn__))\" -Dst_mtimespec=st_mtim" +- libs="$libs -lutil" - ;; - "xDarwin") - cflags="$cflags -DMSG_NOSIGNAL=SO_NOSIGPIPE -DLOGIN_NAME_MAX=MAXLOGNAME" @@ -167,7 +168,7 @@ - ;; -esac +# OpenWrt -+libs='-lncurses -lpcreposix' ++libs='-lncurses -lpcreposix -lutil' +cflags="$cflags -D_GNU_SOURCE -D__dead=\"__attribute__((__noreturn__))\" -Dst_mtimespec=st_mtim" cat << EOF > config.h