diff options
| -rw-r--r-- | groups/211.native_packages_cmdline.group | 10 | ||||
| -rw-r--r-- | patches/sharutils-4.15_pre.local.patch | 38 |
2 files changed, 47 insertions, 1 deletions
diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group index f9032c48..7c677cb7 100644 --- a/groups/211.native_packages_cmdline.group +++ b/groups/211.native_packages_cmdline.group @@ -5,7 +5,7 @@ GROUP_TARGET="native_packages"; NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " bas bash bc busybox cabextract calcurse clipboard_utils coreutils cpio dash datamash dos2unix ed exif figlet findutils gawk grep jush lzop mc mksh moon_buggy mpg123 mp3splt nano ninvaders -openbsd_baseutils profanity pixz pv rc sbase screen sed sloccount tar tcsh +openbsd_baseutils profanity pixz pv rc sbase screen sed sharutils sloccount tar tcsh the_silver_searcher toilet tree terminally_tetris ubase which zsh")"; : ${PKG_BAS_DEPENDS:="ncurses"}; : ${PKG_BAS_SHA256SUM:=ec45efa90aaa7f15647fe7898fa0789ba26dc8e10b7ecf8e049b1310f626b884}; @@ -211,6 +211,14 @@ rc_cv_sysv_sigcld=no"}; : ${PKG_SED_SHA256SUM:=f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633}; : ${PKG_SED_VERSION:=4.8}; : ${PKG_SED_URL:=https://ftp.gnu.org/gnu/sed/sed-${PKG_SED_VERSION}.tar.xz}; +: ${PKG_SHARUTILS_SHA256SUM:=6a22459983d32ef4cbc201b4f43aa5505bc1bd02f2be4bbb81ef56bcb059f8a5}; +: ${PKG_SHARUTILS_VERSION:=4.15}; +: ${PKG_SHARUTILS_URL:=https://ftp.gnu.org/gnu/sharutils/sharutils-${PKG_SHARUTILS_VERSION}.tar.xz}; +: ${PKG_SHARUTILS_CONFIG_CACHE_EXTRA:=" +libopts_cv_test_dev_zero=yes +libopts_cv_run_realpath=yes +libopts_cv_run_strftime=yes +libopts_cv_run_fopen_binary=yes"}; : ${PKG_SLOCCOUNT_SHA256SUM:=fa7fa2bbf2f627dd2d0fdb958bd8ec4527231254c120a8b4322405d8a4e3d12b}; : ${PKG_SLOCCOUNT_VERSION:=2.26}; : ${PKG_SLOCCOUNT_URL:=https://www.dwheeler.com/sloccount/sloccount-${PKG_SLOCCOUNT_VERSION}.tar.gz}; diff --git a/patches/sharutils-4.15_pre.local.patch b/patches/sharutils-4.15_pre.local.patch new file mode 100644 index 00000000..8aa3f75c --- /dev/null +++ b/patches/sharutils-4.15_pre.local.patch @@ -0,0 +1,38 @@ +diff -ru sharutils-4.15.orig/configure sharutils-4.15/configure +--- sharutils-4.15.orig/configure 2015-02-07 19:52:28.000000000 +0100 ++++ sharutils-4.15/configure 2021-12-23 08:45:58.698825416 +0100 +@@ -32620,34 +32620,10 @@ + CATALOGS="$new_CATALOGS" + fi + +-if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- FILE * fp = popen ("date", "rb"); +- exit (fp == NULL); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : + + $as_echo "#define BINARY_MODE_POPEN 1" >>confdefs.h + + +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- + # INVOKE_LIBOPTS_MACROS + ac_cv_header_alloca_h=yes + ac_cv_header_ctype_h=yes |