mirror of
https://github.com/openwrt/packages.git
synced 2026-05-31 06:51:51 +08:00
mosh: fix compilation with new Protobuf
Switch mosh to -std=c++17 to fix compilation with newer Protobuf. Link with libatomic necessary for MIPS and PowerPC. Signed-off-by: George Sapkin <george@sapk.in>
This commit is contained in:
+9
-7
@@ -1,15 +1,14 @@
|
|||||||
#
|
#
|
||||||
# Copyright (C) 2011-2013 Entware
|
# Copyright (C) 2011-2013 Entware
|
||||||
# Copyright (C) 2018 Jakub Tymejczyk <jakub.tymejczyk.pl>
|
# Copyright (C) 2018 Jakub Tymejczyk <jakub.tymejczyk.pl>
|
||||||
# This is free software, licensed under the GNU General Public License v2.
|
|
||||||
# See /LICENSE for more information.
|
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=mosh
|
PKG_NAME:=mosh
|
||||||
PKG_VERSION:=1.4.0
|
PKG_VERSION:=1.4.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://mosh.org/
|
PKG_SOURCE_URL:=https://mosh.org/
|
||||||
@@ -31,7 +30,11 @@ define Package/mosh/Default
|
|||||||
CATEGORY:=Network
|
CATEGORY:=Network
|
||||||
SUBMENU:=SSH
|
SUBMENU:=SSH
|
||||||
TITLE:=Mosh mobile shell
|
TITLE:=Mosh mobile shell
|
||||||
DEPENDS:=+libncursesw +libopenssl +protobuf
|
DEPENDS:= \
|
||||||
|
+libatomic \
|
||||||
|
+libncursesw \
|
||||||
|
+libopenssl \
|
||||||
|
+protobuf
|
||||||
URL:=https://mosh.org/
|
URL:=https://mosh.org/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
@@ -67,7 +70,6 @@ $(call Package/mosh/Default)
|
|||||||
+perlbase-xsloader
|
+perlbase-xsloader
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
||||||
define Package/mosh/Default/description
|
define Package/mosh/Default/description
|
||||||
Mosh is a remote terminal application that allows roaming, supports
|
Mosh is a remote terminal application that allows roaming, supports
|
||||||
intermittent connectivity, and provides intelligent local echo and line
|
intermittent connectivity, and provides intelligent local echo and line
|
||||||
@@ -97,8 +99,8 @@ CONFIGURE_ARGS += \
|
|||||||
CONFIGURE_VARS += \
|
CONFIGURE_VARS += \
|
||||||
ac_cv_have_decl_ffs=yes
|
ac_cv_have_decl_ffs=yes
|
||||||
|
|
||||||
TARGET_CXXFLAGS += -std=c++11
|
TARGET_CXXFLAGS += -std=c++17
|
||||||
TARGET_LDFLAGS += -lncurses
|
TARGET_LDFLAGS += -latomic -lncurses
|
||||||
|
|
||||||
define Package/mosh-client/install
|
define Package/mosh-client/install
|
||||||
$(INSTALL_DIR) $(1)/usr/bin
|
$(INSTALL_DIR) $(1)/usr/bin
|
||||||
|
|||||||
Reference in New Issue
Block a user