# HG changeset patch # User Markus Mützel # Date 1628536259 -7200 # Node ID a48a92c9af10ee5988c4989414c8e5162fa84a22 # Parent c16ae6edfc428ac668649821c677cf61561fac55 libffi: Update to version 3.4.2 (bug #61024). * src/libffi.mk: Update version, checksum and download url. Update build rule. * src/build-python3.mk: Add libffi to dependencies. diff -r c16ae6edfc42 -r a48a92c9af10 src/build-python3.mk --- a/src/build-python3.mk Mon Aug 09 15:15:16 2021 +0200 +++ b/src/build-python3.mk Mon Aug 09 21:10:59 2021 +0200 @@ -8,7 +8,7 @@ $(PKG)_SUBDIR := Python-$($(PKG)_VERSION) $(PKG)_FILE := Python-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://www.python.org/ftp/python/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := +$(PKG)_DEPS := libffi ifneq ($(USE_SYSTEM_GCC),yes) $(PKG)_DEPS += build-gcc endif diff -r c16ae6edfc42 -r a48a92c9af10 src/libffi.mk --- a/src/libffi.mk Mon Aug 09 15:15:16 2021 +0200 +++ b/src/libffi.mk Mon Aug 09 21:10:59 2021 +0200 @@ -3,31 +3,34 @@ PKG := libffi $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3 -$(PKG)_CHECKSUM := 8df6cb570c8d6596a67d1c0773bf00650154f7aa +$(PKG)_VERSION := 3.4.2 +$(PKG)_CHECKSUM := f5fbf0e8b643c4029a069faca32dd0df2c7dd0a2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := ftp://sourceware.org/pub/$(PKG)/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/$(PKG)/$(PKG)/archive/refs/tags/v$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/atgreen/libffi/tags' | \ + $(WGET) -q -O- 'https://github.com/libffi/libffi/tags' | \ $(SED) -n 's,.*releases/tag/v\([0-9][^"]*\).*,\1,p' | \ head -1 endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - --prefix='$(HOST_PREFIX)' \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - $(ENABLE_SHARED_OR_STATIC) \ - && $(CONFIGURE_POST_HOOK) - $(MAKE) -C '$(1)/$(TARGET)' -j '$(JOBS)' - $(MAKE) -C '$(1)/$(TARGET)' -j 1 install DESTDIR='$(3)' + cd '$(1)' && \ + ./autogen.sh && \ + ./configure \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + --prefix='$(HOST_PREFIX)' \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $(ENABLE_SHARED_OR_STATIC) && \ + $(CONFIGURE_POST_HOOK) - if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ - rm -rf "$(3)$(HOST_PREFIX)/share"; \ - fi + $(MAKE) -C '$(1)/$(TARGET)' -j '$(JOBS)' + $(MAKE) -C '$(1)/$(TARGET)' -j 1 install DESTDIR='$(3)' + + if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ + rm -rf "$(3)$(HOST_PREFIX)/share"; \ + fi endef