package/libgpg-error: bump to version 1.21

PATCH New Jörg Krause 4 participants 6 messages Jan 2, 2016 – Jul 3, 2016

lore

Share & tools

lore

Jörg Krause

author

2016-01-02 19:28 UTC #0 lore raw

PATCH 1/1 package/libgpg-error: bump to version 1.21

This patch is based on a patch sent by Vicente Olivert Riera and commented by Arnout Vandecappelle [1].

- Bump version to 1.21
- Add a hook to fix cross-compilation
- Fix license and license files
- Remove patch applied upstream
- Add a BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS variable
- Propagate the dependencies using that variable:
* package/gnupg2
* package/libassuan
* package/libgcrypt
* package/libgpgme
* package/libksba
* package/netatalk
* package/opkg
* package/vpnc
* package/cppcms
* package/crda
* package/gcr
* package/kodi
* package/libmicrohttpd
* package/network-manager
* package/ntfs-3g
* package/php-gnupg
* package/rng-tools
* package/strongswan
* package/systemd

[1] http://patchwork.ozlabs.org/patch/416427/

Cc Arnout Vandecappelle <[email protected]>

Cc Vicente Olivert Riera <[email protected]>

Signed-off-by J?rg Krause <[email protected]>

---
 package/cppcms/Config.in                           |  1 +
 package/crda/Config.in                             |  1 +
 package/gcr/Config.in                              |  1 +
 package/gnupg2/Config.in                           |  1 +
 package/kodi/Config.in                             |  1 +
 package/libassuan/Config.in                        |  1 +
 package/libgcrypt/Config.in                        |  1 +
 .../0001-avoid-breakage-with-gcc-5.patch           | 56 ----------------------
 package/libgpg-error/Config.in                     | 12 +++++
 package/libgpg-error/libgpg-error.hash             |  2 +-
 package/libgpg-error/libgpg-error.mk               | 37 +++++++++++---
 package/libgpgme/Config.in                         |  1 +
 package/libksba/Config.in                          |  1 +
 package/libmicrohttpd/Config.in                    |  1 +
 package/netatalk/Config.in                         |  1 +
 package/network-manager/Config.in                  |  1 +
 package/ntfs-3g/Config.in                          |  1 +
 package/opkg/Config.in                             |  1 +
 package/php-gnupg/Config.in                        |  1 +
 package/rng-tools/Config.in                        |  1 +
 package/strongswan/Config.in                       |  1 +
 package/systemd/Config.in                          |  1 +
 package/vpnc/Config.in                             |  1 +
 23 files changed, 63 insertions(+), 63 deletions(-)
 delete mode 100644 package/libgpg-error/0001-avoid-breakage-with-gcc-5.patch

package/cppcms/Config.in +1 -0

index 85ba118..4d38883 100644
@@ -4,6 +4,7 @@ config BR2_PACKAGE_CPPCMS
 	select BR2_PACKAGE_PCRE
 	select BR2_PACKAGE_LIBGCRYPT
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on BR2_USE_WCHAR

package/crda/Config.in +1 -0

index 4eb1643..c44cb30 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CRDA
 	bool "crda"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_LIBGCRYPT

package/gcr/Config.in +1 -0

index cd40ca1..e233fff 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GCR
 	bool "gcr"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # gnupg2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2

package/gnupg2/Config.in +1 -0

index e246fd7..08b96b6 100644
@@ -12,6 +12,7 @@ config BR2_PACKAGE_GNUPG2
 	select BR2_PACKAGE_LIBPTHSEM
 	select BR2_PACKAGE_LIBPTHSEM_COMPAT
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
 	depends on BR2_USE_MMU # libassuan
 	depends on !BR2_STATIC_LIBS
 	help

package/kodi/Config.in +1 -0

index 124c8d5..57d1e57 100644
@@ -87,6 +87,7 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_YAJL
 	select BR2_PACKAGE_ZLIB
 	select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL

package/libassuan/Config.in +1 -0

index 4f0a6ba..c4369a3 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBASSUAN
 	bool "libassuan"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBGPG_ERROR
 	help

package/libgcrypt/Config.in +1 -0

index dd8f270..6832a01 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBGCRYPT
 	bool "libgcrypt"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
 	select BR2_PACKAGE_LIBGPG_ERROR
 	help
 	  LibGCrypt is GNU's basic cryptographic library.

package/libgpg-error/0001-avoid-breakage-with-gcc-5.patch deleted +0 ~~-56~~

56 lines not on this page · raw message

package/libgpg-error/Config.in +12 -0

index 8287f98..f948c04 100644
@@ -1,5 +1,17 @@
+config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
+	bool
+	# see src/syscfg/
+	default y if BR2_aarch64 || BR2_aarch64_eb || BR2_arm	|| \
+		BR2_armeb	|| BR2_i386	|| BR2_mips	|| \
+		BR2_mipsel	|| BR2_mips64	|| BR2_mips64el	|| \
+		BR2_m68k	|| BR2_powerpc	|| BR2_powerpc64 || \
+		BR2_powerpc64le	|| BR2_sh4	|| BR2_sh4eb	|| \
+		BR2_sh4a	|| BR2_sh4aeb	|| BR2_sparc	|| \
+		BR2_sparc64	|| BR2_x86_64
+
 config BR2_PACKAGE_LIBGPG_ERROR
 	bool "libgpg-error"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
 	help
 	  Libgpg-error is a small library with error codes and
 	  descriptions shared by most GnuPG related software.

package/libgpg-error/libgpg-error.hash +1 -1

index 76aff5d..7f0c27e 100644
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	fa6fbf315efa33a943751e3c4d04ea3d41ddf4bdee5727de3c0978277d52923b	libgpg-error-1.12.tar.gz
+sha256	af1b6e842b564ae711d71158bba97a474ba914eeba0ba288865c68b14fc6acba	libgpg-error-1.21.tar.gz

package/libgpg-error/libgpg-error.mk +31 -6

index 52b7058..1a55a39 100644
@@ -4,14 +4,39 @@
 #
 ################################################################################
 
-LIBGPG_ERROR_VERSION = 1.12
+LIBGPG_ERROR_VERSION = 1.21
 LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
-LIBGPG_ERROR_LICENSE = LGPLv2.1+
-LIBGPG_ERROR_LICENSE_FILES = COPYING.LIB
+LIBGPG_ERROR_LICENSE = GPLv2+, LGPLv2.1+
+LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB
 LIBGPG_ERROR_INSTALL_STAGING = YES
 LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config
-# we patch src/Makefile.am
-LIBGPG_ERROR_AUTORECONF = YES
-LIBGPG_ERROR_GETTEXTIZE = YES
+
+# default
+LIBGPG_ERROR_ARCH = $(ARCH)
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu
+
+# special treatments
+ifeq ($(ARCH),$(filter $(ARCH),aarch64_eb))
+LIBGPG_ERROR_ARCH = aarch64
+else ifeq ($(ARCH),$(filter $(ARCH),arm armeb))
+LIBGPG_ERROR_ARCH = arm
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu$(ABI)
+else ifeq ($(ARCH),$(filter $(ARCH),mips64))
+LIBGPG_ERROR_ARCH = mips
+else ifeq ($(ARCH),$(filter $(ARCH),sh4eb sh4a sh4aeb))
+LIBGPG_ERROR_ARCH = sh4
+else ifeq ($(findstring x86_64,$(ARCH)),x86_64)
+LIBGPG_ERROR_TRIPLET = pc-linux-gnu
+else ifeq ($(ARCH),$(filter $(ARCH),i386 i486 i586 i686))
+LIBGPG_ERROR_ARCH = i686
+LIBGPG_ERROR_TRIPLET = pc-linux-gnu
+endif
+
+define LIBGPG_ERROR_FIX_CROSS_COMPILATION
+	cd $(@D)/src/syscfg && \
+	ln -s lock-obj-pub.$(LIBGPG_ERROR_ARCH)-$(LIBGPG_ERROR_TRIPLET).h \
+		lock-obj-pub.$(GNU_TARGET_NAME).h
+endef
+LIBGPG_ERROR_PRE_CONFIGURE_HOOKS += LIBGPG_ERROR_FIX_CROSS_COMPILATION
 
 $(eval $(autotools-package))

package/libgpgme/Config.in +1 -0

index e176dac..59d9fa3 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBGPGME
 	bool "libgpgme"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
 	depends on BR2_USE_MMU # libassuan
 	#gnupg is not needed to build, but at runtime.
 	select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2

package/libksba/Config.in +1 -0

index 780fed9..b89b5ee 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBKSBA
 	bool "libksba"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
 	select BR2_PACKAGE_LIBGPG_ERROR
 	help
 	  CMS and X.509 library

package/libmicrohttpd/Config.in +1 -0

index 68191ea..f9250bf 100644
@@ -13,6 +13,7 @@ if BR2_PACKAGE_LIBMICROHTTPD
 
 config BR2_PACKAGE_LIBMICROHTTPD_SSL
 	bool "https support"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_GNUTLS
 	select BR2_PACKAGE_LIBGCRYPT

package/netatalk/Config.in +1 -0

index ec6ec2c..5a237a4 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NETATALK
 	bool "netatalk"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS

package/network-manager/Config.in +1 -0

index 8b4607c..436327e 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NETWORK_MANAGER
 	bool "networkmanager"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	depends on BR2_USE_MMU # dbus
 	depends on BR2_PACKAGE_HAS_UDEV
 	# Tested with 3.2, but may even work with earlier versions

package/ntfs-3g/Config.in +1 -0

index d6d1481..b9f7eaf 100644
@@ -18,6 +18,7 @@ if BR2_PACKAGE_NTFS_3G
 
 config BR2_PACKAGE_NTFS_3G_ENCRYPTED
 	bool "encrypted volumes"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	select BR2_PACKAGE_GNUTLS
 	select BR2_PACKAGE_LIBGCRYPT
 	help

package/opkg/Config.in +1 -0

index 495ce91..fd9e248 100644
@@ -22,6 +22,7 @@ if BR2_PACKAGE_OPKG
 
 config BR2_PACKAGE_OPKG_GPG_SIGN
 	bool "gnupg support"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
 	select BR2_PACKAGE_LIBGPGME
 	select BR2_PACKAGE_LIBGPG_ERROR
 	help

package/php-gnupg/Config.in +1 -0

index 49fb43b..113017d 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PHP_GNUPG
 	bool "php-gnupg"
 	depends on BR2_PACKAGE_PHP
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # ligpgme
 	depends on BR2_USE_MMU # libassuan
 	select BR2_PACKAGE_LIBGPGME
 	help

package/rng-tools/Config.in +1 -0

index 469b60e..78ea00a 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_RNG_TOOLS
 	bool "rng-tools"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	# For rdrand ligcrypt is required and it's not obvious to users
 	select BR2_PACKAGE_LIBGCRYPT if BR2_i386 || BR2_x86_64

package/strongswan/Config.in +1 -0

index b26f1c7..83eea55 100644
@@ -32,6 +32,7 @@ config BR2_PACKAGE_STRONGSWAN_OPENSSL
 
 config BR2_PACKAGE_STRONGSWAN_GCRYPT
 	bool "libgcrypt"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	select BR2_PACKAGE_LIBGCRYPT
 
 config BR2_PACKAGE_STRONGSWAN_GMP

package/systemd/Config.in +1 -0

index f7fc3bb..fb8542f 100644
@@ -66,6 +66,7 @@ config BR2_PACKAGE_PROVIDES_UDEV
 
 config BR2_PACKAGE_SYSTEMD_ALL_EXTRAS
 	bool "enable all extras"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	select BR2_PACKAGE_XZ
 	select BR2_PACKAGE_LIBGCRYPT
 	help

package/vpnc/Config.in +1 -0

index bc27331..38875f6 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_VPNC
 	bool "vpnc"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBGPG_ERROR

Signature · 1 line

2.6.4

Arnout Vandecappelle

2016-01-02 22:59 UTC #1 lore raw

PATCH 1/1 package/libgpg-error: bump to version 1.21

Quoted 66 lines · J?rg Krause

This patch is based on a patch sent by Vicente Olivert Riera and commented by Arnout Vandecappelle [1].
- Bump version to 1.21
- Add a hook to fix cross-compilation
- Fix license and license files
- Remove patch applied upstream
- Add a BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS variable
- Propagate the dependencies using that variable:
* package/gnupg2
* package/libassuan
* package/libgcrypt
* package/libgpgme
* package/libksba
* package/netatalk
* package/opkg
* package/vpnc
* package/cppcms
* package/crda
* package/gcr
* package/kodi
* package/libmicrohttpd
* package/network-manager
* package/ntfs-3g
* package/php-gnupg
* package/rng-tools
* package/strongswan
* package/systemd
[1] http://patchwork.ozlabs.org/patch/416427/
Cc Arnout Vandecappelle <[email protected]>
Cc Vicente Olivert Riera <[email protected]>
Signed-off-by J?rg Krause <[email protected]>
---
 package/cppcms/Config.in                           |  1 +
 package/crda/Config.in                             |  1 +
 package/gcr/Config.in                              |  1 +
 package/gnupg2/Config.in                           |  1 +
 package/kodi/Config.in                             |  1 +
 package/libassuan/Config.in                        |  1 +
 package/libgcrypt/Config.in                        |  1 +
 .../0001-avoid-breakage-with-gcc-5.patch           | 56 ----------------------
 package/libgpg-error/Config.in                     | 12 +++++
 package/libgpg-error/libgpg-error.hash             |  2 +-
 package/libgpg-error/libgpg-error.mk               | 37 +++++++++++---
 package/libgpgme/Config.in                         |  1 +
 package/libksba/Config.in                          |  1 +
 package/libmicrohttpd/Config.in                    |  1 +
 package/netatalk/Config.in                         |  1 +
 package/network-manager/Config.in                  |  1 +
 package/ntfs-3g/Config.in                          |  1 +
 package/opkg/Config.in                             |  1 +
 package/php-gnupg/Config.in                        |  1 +
 package/rng-tools/Config.in                        |  1 +
 package/strongswan/Config.in                       |  1 +
 package/systemd/Config.in                          |  1 +
 package/vpnc/Config.in                             |  1 +
 23 files changed, 63 insertions(+), 63 deletions(-)
 delete mode 100644 package/libgpg-error/0001-avoid-breakage-with-gcc-5.patch
package/cppcms/Config.in +0 -0
index 85ba118..4d38883 100644

package/cppcms/Config.in config BR2_PACKAGE_CPPCMS · line 7

Quoted 4 lines

package/cppcms/Config.in +1 -0

@@ -4,6 +4,7 @@ config BR2_PACKAGE_CPPCMS
 	select BR2_PACKAGE_PCRE
 	select BR2_PACKAGE_LIBGCRYPT
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt

libgcrypt? Shouldn't that be libgpg-error?

Quoted 3 lines

package/cppcms/Config.in +0 -0

 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on BR2_USE_WCHAR

[snip]

Quoted 11 lines

package/libgpg-error/Config.in +6 -0

index 8287f98..f948c04 100644
@@ -1,5 +1,17 @@
+config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
+	bool
+	# see src/syscfg/
+	default y if BR2_aarch64 || BR2_aarch64_eb || BR2_arm	|| \
+		BR2_armeb	|| BR2_i386	|| BR2_mips	|| \
+		BR2_mipsel	|| BR2_mips64	|| BR2_mips64el	|| \

package/libgpg-error/Config.in line 16

Quoted 10 lines

package/libgpg-error/Config.in +6 -0

+		BR2_m68k	|| BR2_powerpc	|| BR2_powerpc64 || \
+		BR2_powerpc64le	|| BR2_sh4	|| BR2_sh4eb	|| \
+		BR2_sh4a	|| BR2_sh4aeb	|| BR2_sparc	|| \
+		BR2_sparc64	|| BR2_x86_64
+
 config BR2_PACKAGE_LIBGPG_ERROR
 	bool "libgpg-error"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
 	help
 	  Libgpg-error is a small library with error codes and

It's mind-boggling that "a small library with error codes" needs
architecture-specific handling...

Quoted 14 lines

package/libgpg-error/Config.in +0 -0

 	  descriptions shared by most GnuPG related software.

package/libgpg-error/libgpg-error.hash +1 -1

index 76aff5d..7f0c27e 100644
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	fa6fbf315efa33a943751e3c4d04ea3d41ddf4bdee5727de3c0978277d52923b	libgpg-error-1.12.tar.gz
+sha256	af1b6e842b564ae711d71158bba97a474ba914eeba0ba288865c68b14fc6acba	libgpg-error-1.21.tar.gz

package/libgpg-error/libgpg-error.mk +0 -0

index 52b7058..1a55a39 100644

package/libgpg-error/libgpg-error.mk line 10

Quoted 10 lines

package/libgpg-error/libgpg-error.mk +3 -3

@@ -4,14 +4,39 @@
 #
 ################################################################################
 
-LIBGPG_ERROR_VERSION = 1.12
+LIBGPG_ERROR_VERSION = 1.21
 LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
-LIBGPG_ERROR_LICENSE = LGPLv2.1+
-LIBGPG_ERROR_LICENSE_FILES = COPYING.LIB
+LIBGPG_ERROR_LICENSE = GPLv2+, LGPLv2.1+
+LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB

The files that end up on the target are all LGPLv2.1+, it's only the scripts
that generate some of the source files that are GPLv2+. Which is probably the reason why only the LGPLv2.1+ was mentioned originally. So to make it crystal clear:

LIBGPG_ERROR_LICENSE = LGPLv2.1+, GPLv2+ (build scripts) LIBGPG_ERROR_LICENSE_FILES = COPYING.LIB COPYING

package/libgpg-error/libgpg-error.mk line 19

Quoted 12 lines

package/libgpg-error/libgpg-error.mk +7 -3

 LIBGPG_ERROR_INSTALL_STAGING = YES
 LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config
-# we patch src/Makefile.am
-LIBGPG_ERROR_AUTORECONF = YES
-LIBGPG_ERROR_GETTEXTIZE = YES
+
+# default
+LIBGPG_ERROR_ARCH = $(ARCH)
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu
+
+# special treatments
+ifeq ($(ARCH),$(filter $(ARCH),aarch64_eb))

The filter is kind of redundant here. But I guess it's nice to have the same
construct everywhere.

Quoted 28 lines

package/libgpg-error/libgpg-error.mk +21 -0

+LIBGPG_ERROR_ARCH = aarch64
+else ifeq ($(ARCH),$(filter $(ARCH),arm armeb))
+LIBGPG_ERROR_ARCH = arm
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu$(ABI)
+else ifeq ($(ARCH),$(filter $(ARCH),mips64))
+LIBGPG_ERROR_ARCH = mips
+else ifeq ($(ARCH),$(filter $(ARCH),sh4eb sh4a sh4aeb))
+LIBGPG_ERROR_ARCH = sh4
+else ifeq ($(findstring x86_64,$(ARCH)),x86_64)
+LIBGPG_ERROR_TRIPLET = pc-linux-gnu
+else ifeq ($(ARCH),$(filter $(ARCH),i386 i486 i586 i686))
+LIBGPG_ERROR_ARCH = i686
+LIBGPG_ERROR_TRIPLET = pc-linux-gnu
+endif
+
+define LIBGPG_ERROR_FIX_CROSS_COMPILATION
+	cd $(@D)/src/syscfg && \
+	ln -s lock-obj-pub.$(LIBGPG_ERROR_ARCH)-$(LIBGPG_ERROR_TRIPLET).h \
+		lock-obj-pub.$(GNU_TARGET_NAME).h
+endef
+LIBGPG_ERROR_PRE_CONFIGURE_HOOKS += LIBGPG_ERROR_FIX_CROSS_COMPILATION
 
 $(eval $(autotools-package))

package/libgpgme/Config.in +0 -0

index e176dac..59d9fa3 100644

package/libgpgme/Config.in line 3

Quoted 3 lines

package/libgpgme/Config.in +1 -0

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBGPGME
 	bool "libgpgme"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS

Missing comment. Also in other packages.

package/libgpgme/Config.in line 6

Quoted 3 lines

package/libgpgme/Config.in +0 -0

 	depends on BR2_USE_MMU # libassuan
 	#gnupg is not needed to build, but at runtime.
 	select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2

[snip]

Regards,
Arnout

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Jörg Krause

author

2016-03-20 20:28 UTC #2 lore raw

PATCH 1/1 package/libgpg-error: bump to version 1.21

Hi Arnout,

I'm really sorry for the long delay. This patch has lost my attention...

Quoted 67 lines · Arnout Vandecappelle

Quoted 66 lines · J?rg Krause
This patch is based on a patch sent by Vicente Olivert Riera and commented by
Arnout Vandecappelle [1].
- Bump version to 1.21
- Add a hook to fix cross-compilation
- Fix license and license files
- Remove patch applied upstream
- Add a BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS variable
- Propagate the dependencies using that variable:
????* package/gnupg2
????* package/libassuan
????* package/libgcrypt
????* package/libgpgme
????* package/libksba
????* package/netatalk
????* package/opkg
????* package/vpnc
????* package/cppcms
????* package/crda
????* package/gcr
????* package/kodi
????* package/libmicrohttpd
????* package/network-manager
????* package/ntfs-3g
????* package/php-gnupg
????* package/rng-tools
????* package/strongswan
????* package/systemd
[1] http://patchwork.ozlabs.org/patch/416427/
Cc Arnout Vandecappelle <[email protected]>
Cc Vicente Olivert Riera <[email protected]>
Signed-off-by J?rg Krause <[email protected]>
---
?package/cppcms/Config.in???????????????????????????|??1 +
?package/crda/Config.in?????????????????????????????|??1 +
?package/gcr/Config.in??????????????????????????????|??1 +
?package/gnupg2/Config.in???????????????????????????|??1 +
?package/kodi/Config.in?????????????????????????????|??1 +
?package/libassuan/Config.in????????????????????????|??1 +
?package/libgcrypt/Config.in????????????????????????|??1 +
?.../0001-avoid-breakage-with-gcc-5.patch???????????| 56 ----------
------------
?package/libgpg-error/Config.in?????????????????????| 12 +++++
?package/libgpg-error/libgpg-error.hash?????????????|??2 +-
?package/libgpg-error/libgpg-error.mk???????????????| 37
+++++++++++---
?package/libgpgme/Config.in?????????????????????????|??1 +
?package/libksba/Config.in??????????????????????????|??1 +
?package/libmicrohttpd/Config.in????????????????????|??1 +
?package/netatalk/Config.in?????????????????????????|??1 +
?package/network-manager/Config.in??????????????????|??1 +
?package/ntfs-3g/Config.in??????????????????????????|??1 +
?package/opkg/Config.in?????????????????????????????|??1 +
?package/php-gnupg/Config.in????????????????????????|??1 +
?package/rng-tools/Config.in????????????????????????|??1 +
?package/strongswan/Config.in???????????????????????|??1 +
?package/systemd/Config.in??????????????????????????|??1 +
?package/vpnc/Config.in?????????????????????????????|??1 +
?23 files changed, 63 insertions(+), 63 deletions(-) ?delete mode 100644 package/libgpg-error/0001-avoid-breakage-with- gcc-5.patch

Quoted 11 lines

Quoted 10 lines
package/cppcms/Config.in +0 -0
index 85ba118..4d38883 100644
@@ -4,6 +4,7 @@ config BR2_PACKAGE_CPPCMS
? select BR2_PACKAGE_PCRE
? select BR2_PACKAGE_LIBGCRYPT
? depends on BR2_INSTALL_LIBSTDCPP
package/cppcms/Config.in +1 -0
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS #
libgcrypt
?libgcrypt? Shouldn't that be libgpg-error?

I meant?libgcrypt ->?libgpg-error

Quoted 28 lines

Quoted 4 lines
? depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
? depends on !BR2_STATIC_LIBS # dlopen()
? depends on BR2_USE_WCHAR
[snip]
Quoted 23 lines
package/libgpg- renamed from package/libgpg-error/Config.in +0 -0
error/Config.in
index 8287f98..f948c04 100644
package/libgpg-error/Config.in +9 -0
@@ -1,5 +1,17 @@
+config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
+	bool
+	# see src/syscfg/
+	default y if BR2_aarch64 || BR2_aarch64_eb || BR2_arm	
 || \
+		BR2_armeb	|| BR2_i386	|| BR2_mips	
 || \
+		BR2_mipsel	|| BR2_mips64	||
 BR2_mips64el	|| \
+		BR2_m68k	|| BR2_powerpc	||
 BR2_powerpc64 || \
+		BR2_powerpc64le	|| BR2_sh4	||
 BR2_sh4eb	|| \
+		BR2_sh4a	|| BR2_sh4aeb	|| BR2_sparc	
|| \
package/libgpg-error/Config.in +1 -0
+		BR2_sparc64	|| BR2_x86_64

Quoted 8 lines

Quoted 6 lines
+
?config BR2_PACKAGE_LIBGPG_ERROR
? bool "libgpg-error"
package/libgpg-error/Config.in +1 -0
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
? help
? ??Libgpg-error is a small library with error codes and
?It's mind-boggling that "a small library with error codes" needs architecture-specific handling...

It is indeed! I had a closer look and I think the whole magic libgpg- error does for retrieving the initialization of a lock object can be done without all the target configuration files. I'll contact the maintainers about this issue.

Best regards
J?rg Krause

Gustavo Zacarias

2016-04-15 19:15 UTC #3 lore raw

PATCH 1/1 package/libgpg-error: bump to version 1.21

Quoted 8 lines · J?rg Krause

Hi Arnout,
I'm really sorry for the long delay. This patch has lost my attention...
Quoted 2 lines
It's mind-boggling that "a small library with error codes" needs
architecture-specific handling...

Quoted 7 lines

It is indeed! I had a closer look and I think the whole magic libgpg- error does for retrieving the initialization of a lock object can be done without all the target configuration files. I'll contact the maintainers about this issue.
Best regards
J?rg Krause

Hi all.
A small attention note: this is now required for the recently released libgcrypt 1.7.0 since it depends on gpg-error >= 1.13 (which uses the new mutex code IIRC which causes this headache).
It's not a high-priority since it's just new feature, no security bug fixes... yet ;)
Regards.

Jörg Krause

author

2016-04-16 07:06 UTC #4 lore raw

PATCH 1/1 package/libgpg-error: bump to version 1.21

Quoted 21 lines · Gustavo Zacarias

Quoted 16 lines · J?rg Krause
Hi Arnout,
I'm really sorry for the long delay. This patch has lost my attention...
Quoted 3 lines
? It's mind-boggling that "a small library with error codes" needs
architecture-specific handling...
It is indeed! I had a closer look and I think the whole magic libgpg-
error does for retrieving the initialization of a lock object can be
done without all the target configuration files. I'll contact the maintainers about this issue.
Quoted 2 lines
Best regards
J?rg Krause

Quoted 11 lines

Hi all.
A small attention note: this is now required for the recently released?
libgcrypt 1.7.0 since it depends on gpg-error >= 1.13 (which uses the?
new mutex code IIRC which causes this headache).
It's not a high-priority since it's just new feature, no security bug?
fixes... yet ;)
Regards.

I started a discussion with upstream [1] about this issue and proposed a patch [2] to fix the architucture dependends (which is none in my mind).

Let's hope we can find a suitable solution...

[1]?http://comments.gmane.org/gmane.comp.encryption.gpg.devel/21150 [2]?http://comments.gmane.org/gmane.comp.encryption.gpg.devel/21176

Maxime Hadjinlian

2016-07-03 22:07 UTC #5 lore raw

PATCH 1/1 package/libgpg-error: bump to version 1.21

Hi Jorg, all,

Thanks a lot for you patch, since upstream doesn't really appear to be looking forward a solution, I have respinned it so we can merge it. You can find it there: https://patchwork.ozlabs.org/patch/562100/

This patch will be marked as "Changes Requested", feel free to continue the discussion if you want to add anything.

Quoted 46 lines · J?rg Krause

Quoted 21 lines · Gustavo Zacarias
Quoted 16 lines · J?rg Krause
Hi Arnout,
I'm really sorry for the long delay. This patch has lost my attention...
Quoted 3 lines
It's mind-boggling that "a small library with error codes"
needs
architecture-specific handling...
It is indeed! I had a closer look and I think the whole magic libgpg-
error does for retrieving the initialization of a lock object can be
done without all the target configuration files. I'll contact the maintainers about this issue.
Quoted 2 lines
Best regards
J?rg Krause
Quoted 11 lines
Hi all.
A small attention note: this is now required for the recently released
libgcrypt 1.7.0 since it depends on gpg-error >= 1.13 (which uses the
new mutex code IIRC which causes this headache).
It's not a high-priority since it's just new feature, no security bug
fixes... yet ;)
Regards.
I started a discussion with upstream [1] about this issue and proposed a patch [2] to fix the architucture dependends (which is none in my mind).
Let's hope we can find a suitable solution...
[1] http://comments.gmane.org/gmane.comp.encryption.gpg.devel/21150
[2] http://comments.gmane.org/gmane.comp.encryption.gpg.devel/21176
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot