Skip to content

Commit 92c2b3c

Browse files
macOS: Use macOS-compatible tar invocation
Tar on macOS doesn't understand option -a when used with -x - it is just assumed to be set to true. This patch replaces `tar xaf` with `tar xf` invocation. Signed-off-by: Anton Kolesov <[email protected]>
1 parent f92cf6a commit 92c2b3c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ versions >= 3.9 are supported. Linux sources should be located in the directory
9090
named `linux` that is the sibling of this `toolchain` directory. For example:
9191

9292
$ wget https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.2.tar.xz
93-
$ tar xaf linux-4.8.2.tar.xz --transform=s/linux-4.8.2/linux/
93+
$ tar xf linux-4.8.2.tar.xz --transform=s/linux-4.8.2/linux/
9494

9595
### Using Git repositories
9696

arc-external.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ for url in ${urls} ; do
4141
if [ ! -f "${filename}" ]; then
4242
$WGET "${url}"
4343
fi
44-
tar xaf "${filename}"
44+
tar xf "${filename}"
4545
fi
4646
mv "${dirname}" "${toolname}"
4747
fi

build-uclibc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ if [ $DO_NATIVE_GDB = yes ]; then
593593
fi
594594

595595
build_dir_init ncurses
596-
tar xaf $toolchain_build_dir/_download_tmp/$ncurses_tar --strip-components=1
596+
tar xf $toolchain_build_dir/_download_tmp/$ncurses_tar --strip-components=1
597597

598598
# GCC 5 introduced some changes to the preprocessor output, that causes a
599599
# compilation error in files generated by ncurses. See GCC commit:

release.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ $O/$(ECLIPSE_VANILLA_ZIP_WIN):
711711
# in sync.
712712
$O/.stamp_ide_linux_eclipse: $O/$(ECLIPSE_VANILLA_TGZ_LINUX) $O/$(IDE_PLUGINS_ZIP)
713713
mkdir -m775 -p $O/$(IDE_INSTALL_LINUX)
714-
tar xaf $< -C $O/$(IDE_INSTALL_LINUX)
714+
tar xf $< -C $O/$(IDE_INSTALL_LINUX)
715715
$O/$(IDE_INSTALL_LINUX)/eclipse/eclipse \
716716
-application org.eclipse.equinox.p2.director \
717717
-noSplash \
@@ -733,7 +733,7 @@ $O/.stamp_ide_linux_tar: \
733733
cp -al $O/$(TOOLS_LINUXLE_HS_DIR_LINUX)/* $O/$(IDE_INSTALL_LINUX)
734734
cp -al $O/$(TOOLS_LINUXBE_HS_DIR_LINUX)/* $O/$(IDE_INSTALL_LINUX)
735735
mkdir -m775 $O/$(IDE_INSTALL_LINUX)/eclipse/jre
736-
tar xaf $O/$(JRE_TGZ_LINUX) -C $O/$(IDE_INSTALL_LINUX)/eclipse/jre \
736+
tar xf $O/$(JRE_TGZ_LINUX) -C $O/$(IDE_INSTALL_LINUX)/eclipse/jre \
737737
--strip-components=1
738738
cp -al $O/$(OOCD_DIR_LINUX)/* $O/$(IDE_INSTALL_LINUX)
739739
tar caf $O/$(IDE_TGZ_LINUX) -C $O $(IDE_INSTALL_LINUX)
@@ -818,7 +818,7 @@ $(BUILD_DIR)/libusb-$(LIBUSB_VERSION).tar.bz2:
818818

819819

820820
$(BUILD_DIR)/libusb_linux_src: $(BUILD_DIR)/libusb-$(LIBUSB_VERSION).tar.bz2
821-
tar -C $(BUILD_DIR) -xaf $< --transform='s/libusb-$(LIBUSB_VERSION)/libusb_linux_src/'
821+
tar -C $(BUILD_DIR) -xf $< --transform='s/libusb-$(LIBUSB_VERSION)/libusb_linux_src/'
822822

823823

824824
.PHONY: libusb-linux-install
@@ -832,7 +832,7 @@ $(BUILD_DIR)/libusb_linux_install/lib/libusb-1.0.a: $(BUILD_DIR)/libusb_linux_sr
832832

833833

834834
$(BUILD_DIR)/libusb_win_src: $(BUILD_DIR)/libusb-$(LIBUSB_VERSION).tar.bz2
835-
tar -C $(BUILD_DIR) -xaf $< --transform='s/libusb-$(LIBUSB_VERSION)/libusb_win_src/'
835+
tar -C $(BUILD_DIR) -xf $< --transform='s/libusb-$(LIBUSB_VERSION)/libusb_win_src/'
836836

837837

838838
# It looks like that libusb Makefile is not parallel-friendly, it fails with error

0 commit comments

Comments
 (0)