diff options
Diffstat (limited to 'src/libarchive.mk')
| -rw-r--r-- | src/libarchive.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libarchive.mk b/src/libarchive.mk index 805a97e..16bc3bc 100644 --- a/src/libarchive.mk +++ b/src/libarchive.mk @@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.libarchive.org/downloads/$($(PKG)_FILE) -$(PKG)_DEPS := gcc bzip2 libiconv libxml2 openssl xz zlib +$(PKG)_DEPS := gcc bzip2 libiconv libxml2 nettle openssl xz zlib define $(PKG)_UPDATE $(WGET) -q -O- 'https://www.libarchive.org/downloads/' | \ @@ -19,20 +19,20 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(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 \ + # use nettle instead of bcrypt for CNG(Crypto Next Generation) + cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \ $(MXE_CONFIGURE_OPTS) \ --disable-bsdtar \ --disable-bsdcpio \ --disable-bsdcat \ + --without-cng \ + --with-nettle \ XML2_CONFIG='$(PREFIX)/$(TARGET)'/bin/xml2-config - $(MAKE) -C '$(1)' -j '$(JOBS)' man_MANS= - $(MAKE) -C '$(1)' -j 1 install man_MANS= + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' man_MANS= + $(MAKE) -C '$(BUILD_DIR)' -j 1 install man_MANS= '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libarchive.exe' \ - `'$(TARGET)-pkg-config' --libs-only-l libarchive` + `'$(TARGET)-pkg-config' --libs-only-l --cflags libarchive` endef |