summaryrefslogtreecommitdiffstats
path: root/rules/libgpg-error.make
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-12-02 14:13:41 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-12-03 22:28:37 +0100
commite4019333c9762a41d132907eccfa602208e5d5e9 (patch)
treee4986bc22de50087260ad3f6c371f8f16728ab60 /rules/libgpg-error.make
parentd8890093711ac3db6dc3f13973c12ddddedb37ab (diff)
downloadptxdist-e4019333c9762a41d132907eccfa602208e5d5e9.tar.gz
ptxdist-e4019333c9762a41d132907eccfa602208e5d5e9.tar.xz
libgpg-error: version bump 1.12 -> 1.20
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/libgpg-error.make')
-rw-r--r--rules/libgpg-error.make29
1 files changed, 25 insertions, 4 deletions
diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
index aa73e00d5..0efcd9dce 100644
--- a/rules/libgpg-error.make
+++ b/rules/libgpg-error.make
@@ -17,11 +17,14 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error
#
# Paths and names
#
-LIBGPG_ERROR_VERSION := 1.12
-LIBGPG_ERROR_MD5 := 8f0eb41a344d19ac2aa9bd101dfb9ce6
+LIBGPG_ERROR_VERSION := 1.20
+LIBGPG_ERROR_MD5 := 9997d9203b672402a04760176811589d
LIBGPG_ERROR := libgpg-error-$(LIBGPG_ERROR_VERSION)
LIBGPG_ERROR_SUFFIX := tar.bz2
-LIBGPG_ERROR_URL := http://artfiles.org/gnupg.org/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) ftp://ftp.gnupg.org/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
+LIBGPG_ERROR_URL := \
+ http://artfiles.org/gnupg.org/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) \
+ https://www.gnupg.org/ftp/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) \
+ ftp://ftp.gnupg.org/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
LIBGPG_ERROR_SOURCE := $(SRCDIR)/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
LIBGPG_ERROR_DIR := $(BUILDDIR)/$(LIBGPG_ERROR)
LIBGPG_ERROR_LICENSE := GPL-2.0, LGPL-2.0
@@ -29,6 +32,8 @@ LIBGPG_ERROR_LICENSE_FILES := \
file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
+LIBGPG_ERROR_TARGET := $(shell target=$(PTXCONF_GNU_TARGET); echo $${target/-*-linux/-$(if $(PTXCONF_ARCH_X86),pc,unknown)-linux})
+
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
@@ -36,7 +41,23 @@ LIBGPG_ERROR_LICENSE_FILES := \
#
# autoconf
#
-LIBGPG_ERROR_CONF_TOOL := autoconf
+LIBGPG_ERROR_CONF_TOOL := autoconf
+LIBGPG_ERROR_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --enable-threads=posix \
+ $(GLOBAL_LARGE_FILE_OPTION) \
+ --disable-nls \
+ --disable-rpath \
+ --enable-build-timestamp="$(PTXDIST_VERSION_YEAR)-$(PTXDIST_VERSION_MONTH)-01T00:00+0000" \
+ --disable-languages \
+ --disable-doc
+
+$(STATEDIR)/libgpg-error.prepare:
+ @$(call targetinfo)
+ @cp -v $(LIBGPG_ERROR_DIR)/src/syscfg/lock-obj-pub.$(LIBGPG_ERROR_TARGET).h \
+ $(LIBGPG_ERROR_DIR)/src/syscfg/lock-obj-pub.$(call remove_quotes, $(PTXCONF_GNU_TARGET)).h
+ @$(call world/prepare, LIBGPG_ERROR)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Target-Install