Mercurial > mxe-octave
changeset 2245:0ce613b66c8c
update package libarchive
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Tue, 14 Feb 2012 12:47:28 +0100 |
| parents | f3a2d7c8ed0c |
| children | 572d4140383a |
| files | src/libarchive-1-fixes.patch src/libarchive.mk |
| diffstat | 2 files changed, 28 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libarchive-1-fixes.patch Tue Feb 14 12:47:28 2012 +0100 @@ -0,0 +1,24 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From 47b80beedcb3d8e6296e2d0b970bb0c82abb4424 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Tue, 14 Feb 2012 12:40:24 +0100 +Subject: [PATCH] fix pkg-config + + +diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in +index 95d7159..8288f31 100644 +--- a/build/pkgconfig/libarchive.pc.in ++++ b/build/pkgconfig/libarchive.pc.in +@@ -8,4 +8,4 @@ Description: library that can create and read several streaming archive formats + Version: @VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -larchive +-Libs.private: @LIBS@ ++Libs.private: @LIBS@ -liconv +-- +1.7.8.3 +
--- a/src/libarchive.mk Sat Feb 11 10:07:27 2012 +0100 +++ b/src/libarchive.mk Tue Feb 14 12:47:28 2012 +0100 @@ -4,13 +4,13 @@ # Libarchive PKG := libarchive $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.5 -$(PKG)_CHECKSUM := e48a3b50de84b1d747f5af9ca5ba90eb6d3a4a78 +$(PKG)_VERSION := 3.0.3 +$(PKG)_CHECKSUM := b774e2675e5c1abafbd4d667402e8c3e72313944 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://code.google.com/p/libarchive/ $(PKG)_URL := http://libarchive.googlecode.com/files/$($(PKG)_FILE) -$(PKG)_DEPS := gcc bzip2 libxml2 openssl xz zlib +$(PKG)_DEPS := gcc bzip2 libiconv libxml2 openssl xz zlib define $(PKG)_UPDATE wget -q -O- 'http://code.google.com/p/libarchive/downloads/list?sort=-uploaded' | \ @@ -34,5 +34,5 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libarchive.exe' \ - -larchive -lz + `'$(TARGET)-pkg-config' --libs-only-l libarchive` endef