From 164bd1fdf826303cfaf32918cdc3354dad13fbe0 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 23 Oct 2021 13:19:04 -0700 Subject: [PATCH] acsccid: fix compilation under macOS uname is not safe for cross compilation. Also fixed up download file name to avoid potential conflicts. Signed-off-by: Rosen Penev --- utils/acsccid/Makefile | 8 +++++--- utils/acsccid/patches/010-uname.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 utils/acsccid/patches/010-uname.patch diff --git a/utils/acsccid/Makefile b/utils/acsccid/Makefile index 2365bc1a76..eceba4ea9a 100644 --- a/utils/acsccid/Makefile +++ b/utils/acsccid/Makefile @@ -9,17 +9,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acsccid PKG_VERSION:=1.1.8 -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_SOURCE:=v$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/acshk/acsccid/archive/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/acshk/acsccid/tar.gz/v$(PKG_VERSION)? PKG_HASH:=68d15eb20e7f52153509f1dc300cf0c68b388c59d7d124ba494fd96c61a6e7c6 + PKG_MAINTAINER:=Vincent JARDIN PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=libtool PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk diff --git a/utils/acsccid/patches/010-uname.patch b/utils/acsccid/patches/010-uname.patch new file mode 100644 index 0000000000..36750347d0 --- /dev/null +++ b/utils/acsccid/patches/010-uname.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -84,7 +84,7 @@ AC_CHECK_FUNCS(select strerror strncpy m + # Select OS specific versions of source files. + AC_SUBST(BUNDLE_HOST) + AC_SUBST(DYN_LIB_EXT) +-BUNDLE_HOST=`uname | sed -e s,/,_,` ++BUNDLE_HOST=Linux + DYN_LIB_EXT="so" + case "$BUNDLE_HOST" in + Darwin) -- 2.30.2