Skip to contentSkip to conversation

expat: bump to version 2.2.4

PATCH New Baruch Siach 2 participants 2 messages Sep 4, 2017 – Sep 6, 2017

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/1 expat: bump to version 2.2.4

Upstream migrated to automake for autotools. Remove the non-existent 'installlib' target. DESTDIR override in not needed anymore, the standard configure --prefix is enough.

Add license hash.

Signed-off-by Baruch Siach <[email protected]>
---
 package/expat/expat.hash | 10 ++++++----
 package/expat/expat.mk   |  4 +---
 2 files changed, 7 insertions(+), 7 deletions(-)
package/expat/expat.hash +6 -4
index ccf74d62128e..ef01ec99489e 100644
@@ -1,5 +1,7 @@
-# From https://sourceforge.net/projects/expat/files/expat/2.2.3/
-md5	f053af63ef5f39bd9b78d01fbc203334	expat-2.2.3.tar.bz2
-sha1	e2be3a2aa8d12ce70184aab418d0d5d96ed86d0e	expat-2.2.3.tar.bz2
+# From https://sourceforge.net/projects/expat/files/expat/2.2.4/
+md5	6e3980aba29a224a9f478d88ac7ec207	expat-2.2.4.tar.bz2
+sha1	3394d6390c041a8f5dec1d5fe7c4af0a23ae4504	expat-2.2.4.tar.bz2
 # Calculated based on the hashes above
-sha256	b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f	expat-2.2.3.tar.bz2
+sha256	03ad85db965f8ab2d27328abcf0bc5571af6ec0a414874b2066ee3fdd372019e	expat-2.2.4.tar.bz2
+# Locally calculated
+sha256	46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76	COPYING
package/expat/expat.mk +1 -3
index a6fa37323d07..ef196ec40c3e 100644
@@ -4,12 +4,10 @@
 #
 ################################################################################
 
-EXPAT_VERSION = 2.2.3
+EXPAT_VERSION = 2.2.4
 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
 EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
 EXPAT_INSTALL_STAGING = YES
-EXPAT_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) installlib
-EXPAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) installlib
 EXPAT_DEPENDENCIES = host-pkgconf
 HOST_EXPAT_DEPENDENCIES = host-pkgconf
 EXPAT_LICENSE = MIT
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH 1/1 expat: bump to version 2.2.4

Hello,

Quoted 3 lines · Baruch Siach

Upstream migrated to automake for autotools. Remove the non-existent 'installlib' target. DESTDIR override in not needed anymore, the standard configure --prefix is enough.

DESTDIR was not overridden at all: we were using the standard DESTDIR=$(STAGING_DIR) and DESTDIR=$(TARGET_DIR). The only reason why the staging opts and target opts were overridden is because we wanted to use the installib target instead of "install".

In addition, the fact that we don't have to pass DESTDIR is not at all related to --prefix. DESTDIR is still passed by the pkg-autotools package infrastructure, and is mandatory. --prefix is defined to /usr, and therefore is not sufficient for autotools to know where we want to install stuff.

I've applied after fixing the commit log on this topic. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com