Skip to content

Commit fac33f9

Browse files
committed
Fix libffi and xz download file extensions
and use name of first prerequisite as an argument to tar's -f option. This is a follow-up on PR #155.
1 parent 6d1511b commit fac33f9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,10 @@ $$(BZIP2_LIB-$(target)): $$(BZIP2_DIR-$(target))/Makefile
272272
XZ_DIR-$(target)=build/$(os)/xz-$(XZ_VERSION)-$(target)
273273
XZ_LIB-$(target)=$$(XZ_DIR-$(target))/_install/lib/liblzma.a
274274

275-
$$(XZ_DIR-$(target))/Makefile: downloads/xz-$(XZ_VERSION).tgz
275+
$$(XZ_DIR-$(target))/Makefile: downloads/xz-$(XZ_VERSION).tar.gz
276276
@echo ">>> Unpack XZ sources for $(target)"
277277
mkdir -p $$(XZ_DIR-$(target))
278-
tar zxf downloads/xz-$(XZ_VERSION).tgz --strip-components 1 -C $$(XZ_DIR-$(target))
278+
tar zxf $$< --strip-components 1 -C $$(XZ_DIR-$(target))
279279
# Configure the build
280280
cd $$(XZ_DIR-$(target)) && \
281281
./configure \
@@ -706,10 +706,10 @@ ifneq ($(os),macOS)
706706
LIBFFI_XCFRAMEWORK-$(os)=build/$(os)/Support/libFFI.xcframework
707707
LIBFFI_DIR-$(os)=build/$(os)/libffi-$(LIBFFI_VERSION)
708708

709-
$$(LIBFFI_DIR-$(os))/darwin_common/include/ffi.h: downloads/libffi-$(LIBFFI_VERSION).tgz $$(PYTHON_XCFRAMEWORK-macOS)
709+
$$(LIBFFI_DIR-$(os))/darwin_common/include/ffi.h: downloads/libffi-$(LIBFFI_VERSION).tar.gz $$(PYTHON_XCFRAMEWORK-macOS)
710710
@echo ">>> Unpack and configure libFFI sources on $(os)"
711711
mkdir -p $$(LIBFFI_DIR-$(os))
712-
tar zxf downloads/libffi-$(LIBFFI_VERSION).tgz --strip-components 1 -C $$(LIBFFI_DIR-$(os))
712+
tar zxf $$< --strip-components 1 -C $$(LIBFFI_DIR-$(os))
713713
# Patch the build to add support for new platforms
714714
cd $$(LIBFFI_DIR-$(os)) && patch -p1 < $(PROJECT_DIR)/patch/libffi.patch
715715
# Configure the build

0 commit comments

Comments
 (0)