Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11708 from neheb/frrrr

Browse source 
frr: add libatomic dependency
This commit is contained in:
Rosen Penev 2020-03-31 00:53:14 -07:00 committed by GitHub
commit 9679dba8f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/frr/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=frr PKG_NAME:=frr
PKG_VERSION:=7.3 PKG_VERSION:=7.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_URL:=https://github.com/FRRouting/frr/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ PKG_SOURCE_URL:=https://github.com/FRRouting/frr/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@ -82,7 +82,7 @@ endef
define Package/frr-libfrr define Package/frr-libfrr
$(call Package/frr/Default) $(call Package/frr/Default)
TITLE:=zebra library TITLE:=zebra library
DEPENDS+=+librt +libjson-c +libyang +FRR_OPENSSL:libopenssl DEPENDS+=+librt +libatomic +libjson-c +libyang +FRR_OPENSSL:libopenssl
CONFLICTS:=quagga-libzebra CONFLICTS:=quagga-libzebra
endef endef
@ -144,6 +144,8 @@ define Package/frr-libfrr/conffiles
/etc/frr/ /etc/frr/
endef endef
TARGET_LDFLAGS += -latomic
define Build/Prepare define Build/Prepare
$(Build/Prepare/Default) $(Build/Prepare/Default)
mkdir -p $(PKG_BUILD_DIR)/build mkdir -p $(PKG_BUILD_DIR)/build