summaryrefslogtreecommitdiffstats
path: root/src/libarchive.mk
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2014-04-15 11:24:07 (GMT)
committerTony Theodore <tonyt@logyst.com>2014-04-15 11:24:07 (GMT)
commit03ff16f884c7c39e95a4a1a07a9584e42ded7c32 (patch)
tree44d95933488d869f1a96ff703de1e6a654945668 /src/libarchive.mk
parent0fe8949441d4b5c3de9cf3c30d6abe14625fda18 (diff)
downloadmxe-03ff16f884c7c39e95a4a1a07a9584e42ded7c32.zip
mxe-03ff16f884c7c39e95a4a1a07a9584e42ded7c32.tar.gz
mxe-03ff16f884c7c39e95a4a1a07a9584e42ded7c32.tar.bz2
package libarchive: enable shared build
Diffstat (limited to 'src/libarchive.mk')
-rw-r--r--src/libarchive.mk11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/libarchive.mk b/src/libarchive.mk
index 33491d6..eb0aec2 100644
--- a/src/libarchive.mk
+++ b/src/libarchive.mk
@@ -18,12 +18,11 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
- $(SED) -i '1i#ifndef LIBARCHIVE_STATIC\n#define LIBARCHIVE_STATIC\n#endif' -i '$(1)/libarchive/archive.h'
- $(SED) -i '1i#ifndef LIBARCHIVE_STATIC\n#define LIBARCHIVE_STATIC\n#endif' -i '$(1)/libarchive/archive_entry.h'
+ $(if $(BUILD_STATIC),\
+ $(SED) -i '1i#ifndef LIBARCHIVE_STATIC\n#define LIBARCHIVE_STATIC\n#endif' -i '$(1)/libarchive/archive.h'
+ $(SED) -i '1i#ifndef LIBARCHIVE_STATIC\n#define LIBARCHIVE_STATIC\n#endif' -i '$(1)/libarchive/archive_entry.h')
cd '$(1)' && ./configure \
- --host='$(TARGET)' \
- --prefix='$(PREFIX)/$(TARGET)' \
- --disable-shared \
+ $(MXE_CONFIGURE_OPTS) \
--disable-bsdtar \
--disable-bsdcpio \
--disable-bsdcat \
@@ -36,5 +35,3 @@ define $(PKG)_BUILD
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libarchive.exe' \
`'$(TARGET)-pkg-config' --libs-only-l libarchive`
endef
-
-$(PKG)_BUILD_SHARED =