Browse Source

Merge pull request #12859 from neheb/gpg

gnupg: fix compilation with GCC10
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
6cb43fd1df
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
  1. +6
    -3
      utils/gnupg/Makefile

+ 6
- 3
utils/gnupg/Makefile View File

@ -9,16 +9,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gnupg PKG_NAME:=gnupg
PKG_VERSION:=1.4.23 PKG_VERSION:=1.4.23
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/gnupg PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/gnupg
PKG_HASH:=c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba PKG_HASH:=c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba
PKG_LICENSE:=GPL-3.0
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -79,11 +80,13 @@ CONFIGURE_ARGS += \
--disable-ldap \ --disable-ldap \
--disable-finger \ --disable-finger \
--disable-dns-srv \ --disable-dns-srv \
--disable-regex \
--disable-regex
MAKE_FLAGS += \ MAKE_FLAGS += \
SUBDIRS="m4 intl zlib util mpi cipher tools g10 keyserver ${checks}" \ SUBDIRS="m4 intl zlib util mpi cipher tools g10 keyserver ${checks}" \
TARGET_CFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),-DEXTERN_UNLESS_MAIN_MODULE=static)
define Package/gnupg/install define Package/gnupg/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpg $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpg $(1)/usr/bin/


Loading…
Cancel
Save