Skip to content

Commit

Permalink
update fd for qoriq
Browse files Browse the repository at this point in the history
- use fd 10.2.0 for qoriq with rust toolchain 1.82.0
  • Loading branch information
hgy59 committed Nov 8, 2024
1 parent bedae80 commit 61ea245
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 5 deletions.
3 changes: 0 additions & 3 deletions cross/fd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ PKG_DIST_SITE = https://github.com/sharkdp/fd/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

# PKG_VERS = 10.* requires rustc >= 1.77.2 (for qoriq we currently have rust 1.77.0 only)
# PKG_VERS = 8.7.1 fails to build for RUST_TARGET = armv7-unknown-linux-gnueabi $(ARMv7L_ARCHS)
# PKG_VERS >= 9 still fails for$(ARMv7L_ARCHS)
# PKG_VERS <= 8.7.0 fails with newer rustc 1.80.1
Expand All @@ -15,8 +14,6 @@ UNSUPPORTED_ARCHS = $(ARMv7L_ARCHS)
# powerpc archs (except qoriq) are not supported
# undefined reference to 'pipe2'
UNSUPPORTED_ARCHS += $(OLD_PPC_ARCHS)
# as long as rustc for qoriq is < 1.77.2
UNSUPPORTED_ARCHS += $(PPC_ARCHS)

include ../../mk/spksrc.archs.mk
# This is still an issue with rustc 1.77.2 (25ef9e3d8 2024-04-09):
Expand Down
1 change: 0 additions & 1 deletion cross/fd_9.0.0/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ PKG_DIST_SITE = https://github.com/sharkdp/fd/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

# PKG_VERS = 10.* requires rustc >= 1.77.2 (for qoriq we currently have rust 1.77.0 only)
# PKG_VERS = 8.7.1 fails to build for RUST_TARGET = armv7-unknown-linux-gnueabi $(ARMv7L_ARCHS)
# PKG_VERS >= 9 still fails for$(ARMv7L_ARCHS)
# PKG_VERS <= 8.7.0 fails with newer rustc 1.80.1
Expand Down
1 change: 0 additions & 1 deletion diyspk/fd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
DEPENDS += cross/fd_8.7.0
SPK_VERS = 8.7.0
else ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
# qoriq has rust 1.77.0
DEPENDS += cross/fd_9.0.0
SPK_VERS = 9.0.0
else
Expand Down

0 comments on commit 61ea245

Please sign in to comment.