mosh: use mips16 and remove configure patch
authorRosen Penev <rosenp@gmail.com>
Tue, 17 Mar 2020 23:15:42 +0000 (16:15 -0700)
committerRosen Penev <rosenp@gmail.com>
Wed, 8 Apr 2020 08:39:06 +0000 (01:39 -0700)
MIPS16 is not needed here.

Removed configure patch and replaced with a configure var.

Removed autoreconf as configure is no longer being patched.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 1ead64489b7c18d3c58d7e24da079c405e0eaf50)

net/mosh/Makefile
net/mosh/patches/010-ffs.patch [deleted file]

index b4a666b87240f987c64194e0d1d305c33251a336..8641b21ce366652098c6e6f9d1590de87a8a53ca 100644 (file)
@@ -19,11 +19,9 @@ PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
-PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=protobuf/host
-PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -93,6 +91,9 @@ CONFIGURE_ARGS += \
        --disable-hardening \
        --without-utempter
 
+CONFIGURE_VARS += \
+       ac_cv_have_decl_ffs=yes
+
 TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -flto -std=c++11
 TARGET_LDFLAGS += -Wl,--gc-sections -lncurses
 
diff --git a/net/mosh/patches/010-ffs.patch b/net/mosh/patches/010-ffs.patch
deleted file mode 100644 (file)
index 7df9a07..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -425,7 +425,8 @@ AC_CHECK_DECL([mach_absolute_time],
- AC_CHECK_DECLS([__builtin_ctz])
- AC_CHECK_DECLS([ffs], [], [],
--  [[#include <strings.h>]])
-+  [[#define _GNU_SOURCE
-+#include <strings.h>]])
- AC_CHECK_DECLS([be64toh, betoh64, bswap64, __builtin_bswap64], [], [],
-   [[#if defined(HAVE_ENDIAN_H)