Skip to content

Commit

Permalink
tools: tar: update to 1.35
Browse files Browse the repository at this point in the history
Instead of backporting select 1.35 fixes to make tar work for us, lets
update to 1.35 now that we have identified the upstream fix for macOS.

Signed-off-by: Robert Marko <[email protected]>
Link: openwrt/openwrt#15743
Signed-off-by: Christian Marangi <[email protected]>
  • Loading branch information
robimarko authored and Ansuel committed Jun 18, 2024
1 parent 157c7bd commit fcdc7da
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 743 deletions.
4 changes: 2 additions & 2 deletions tools/tar/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=tar
PKG_CPE_ID:=cpe:/a:gnu:tar
PKG_VERSION:=1.34
PKG_VERSION:=1.35

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/tar
PKG_HASH:=03d908cf5768cfe6b7ad588c921c6ed21acabfb2b79b788d1330453507647aed
PKG_HASH:=14d55e32063ea9526e057fbf35fcabd53378e769787eff7919c3755b02d2b57e

HOST_BUILD_PARALLEL:=1

Expand Down
35 changes: 35 additions & 0 deletions tools/tar/patches/0001-Fix-savannah-bug-64441.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 6bec1e7e7fe0ae5bbeb66fc9f32b0b1dd156957d Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <[email protected]>
Date: Tue, 18 Jun 2024 14:31:17 +0200
Subject: [PATCH] Fix savannah bug #64441

* src/Makefile.am (tar_LDADD): Add libiconv libraries.

Adapted upstream commit 8632df398b2f548465ebe68b8f494c0d6f8d913d to patch
the pregenerated Makefile.in instead of Makefile.am to avoid invoking
automake which requires m4.

This is required for macOS, as otherwise it will fail with:
Undefined symbols for architecture arm64:
"_iconv", referenced from:
_utf8_convert in utf8.o
"_iconv_open", referenced from:
_utf8_convert in utf8.o
ld: symbol(s) not found for architecture arm64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
---
src/Makefile.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1793,7 +1793,8 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLA
tar_LDADD = $(LIBS) ../lib/libtar.a ../gnu/libgnu.a\
$(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\
$(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(FILE_HAS_ACL_LIB) $(LIB_MBRTOWC)\
- $(LIB_SELINUX) $(LIB_SETLOCALE_NULL)
+ $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) \
+ $(LIBINTL) $(LIBICONV)

all: all-am

Loading

0 comments on commit fcdc7da

Please sign in to comment.