| Message ID | 4e5ee4d92222339d825f51c084a382cd285e52ef.1504543867.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Headers | show |
| Series | expat: bump to version 2.2.4 | expand |
Hello, On Mon, 4 Sep 2017 19:51:07 +0300, Baruch Siach wrote: > 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
diff --git a/package/expat/expat.hash b/package/expat/expat.hash index ccf74d62128e..ef01ec99489e 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -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 diff --git a/package/expat/expat.mk b/package/expat/expat.mk index a6fa37323d07..ef196ec40c3e 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -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
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 <baruch@tkos.co.il> --- package/expat/expat.hash | 10 ++++++---- package/expat/expat.mk | 4 +--- 2 files changed, 7 insertions(+), 7 deletions(-)