pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

bash removed



Module Name:	pkgsrc-wip
Committed By:	mayuresh <mayuresh%acm.org@localhost>
Pushed By:	mayuresh
Date:		Mon Jul 11 19:45:22 2022 +0530
Changeset:	b625c774a7036e5794886f1906a848501b5461f2

Modified Files:
	ltsmin/Makefile
	ltsmin/distinfo
	ltsmin/patches/patch-configure

Log Message:
bash removed

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b625c774a7036e5794886f1906a848501b5461f2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ltsmin/Makefile                |  4 +-
 ltsmin/distinfo                |  2 +-
 ltsmin/patches/patch-configure | 86 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 4 deletions(-)

diffs:
diff --git a/ltsmin/Makefile b/ltsmin/Makefile
index c7ef489cbb..9719031f92 100644
--- a/ltsmin/Makefile
+++ b/ltsmin/Makefile
@@ -15,9 +15,7 @@ WRKSRC=				${WRKDIR}/ltsmin-3.0.2
 GNU_CONFIGURE=			yes
 USE_LANGUAGES=			c c++
 DEPENDS+=			flex>=2.6.4:../../devel/flex
-TOOL_DEPENDS+=			bash-[0-9]*:../../shells/bash
-USE_TOOLS+=			gmake bash
-CONFIG_SHELL=			bash
+USE_TOOLS+=			gmake
 BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 CONFIGURE_ARGS+=		PKG_CONFIG=${PREFIX}/bin/pkg-config
 CONFIGURE_ARGS+=		--docdir=${PREFIX}/share/doc/${PKGBASE}
diff --git a/ltsmin/distinfo b/ltsmin/distinfo
index 6862a7f5fc..f1f2a78f82 100644
--- a/ltsmin/distinfo
+++ b/ltsmin/distinfo
@@ -4,7 +4,7 @@ SHA1 (ltsmin-v3.0.2-source.tgz) = a658aaa6efa4a2c7fd0d48c4e8c406ebb4916c27
 RMD160 (ltsmin-v3.0.2-source.tgz) = 2e36b9cf08dd51ae6554cd8e7d5301726fb7202e
 SHA512 (ltsmin-v3.0.2-source.tgz) = f05f45384e2d12b82f9f59819c5701ad097819b77394296b3927d39183680fa86d7c94b2d2e8d497444887ed1a29b030e09f1808cb5c714ed8c939f9a6e7944a
 Size (ltsmin-v3.0.2-source.tgz) = 3273078 bytes
-SHA1 (patch-configure) = bfd054a8e18c00bc21206246e6f979e87bf969ba
+SHA1 (patch-configure) = 73a890aa67cbbcdd22a99b7dfdd536af50151551
 SHA1 (patch-src_hre_hre__pthread.c) = cbfd8d0e319d560f00f6b335840d9282c2e79fee
 SHA1 (patch-src_pins-lib_modules_dve-pins.c) = a34aca98ccb5527a662af6d758a6afceb37b621e
 SHA1 (patch-src_pins-lib_modules_opaal-pins.c) = e4981cde459648976244044db20f9c4bc7e41234
diff --git a/ltsmin/patches/patch-configure b/ltsmin/patches/patch-configure
index 77cd943675..66369a7591 100644
--- a/ltsmin/patches/patch-configure
+++ b/ltsmin/patches/patch-configure
@@ -8,8 +8,41 @@ skipped for NetBSD
 
 Upstream: https://github.com/utwente-fmt/ltsmin/issues/203
 
+3. $(( doesn't work on sh, changed to $( (
+
 --- configure.orig	2018-07-03 19:29:06.000000000 +0000
 +++ configure
+@@ -198,7 +198,7 @@ test -x / || exit 1"
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+-test \$(( 1 + 1 )) = 2 || exit 1
++test \$( ( 1 + 1 )) = 2 || exit 1
+ 
+   test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+     ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+@@ -398,10 +398,10 @@ fi # as_fn_append
+ # Perform arithmetic evaluation on the ARGs, and store the result in the
+ # global $as_val. Take advantage of shells that can avoid forks. The arguments
+ # must be portable across $(()) and expr.
+-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++if (eval "test \$( ( 1 + 1 ) ) = 2") 2>/dev/null; then :
+   eval 'as_fn_arith ()
+   {
+-    as_val=$(( $* ))
++    as_val=$( ( $* ) )
+   }'
+ else
+   as_fn_arith ()
+@@ -7536,7 +7536,7 @@ xsi_shell=no
+ ( _lt_dummy="a/b/c"
+   test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+       = c,a/b,b/c, \
+-    && eval 'test $(( 1 + 1 )) -eq 2 \
++    && eval 'test $( ( 1 + 1 ) ) -eq 2 \
+     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+   && xsi_shell=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
 @@ -17303,7 +17303,7 @@ ac_try='"$LEX" --stdout conftest.lex >/d
  eval ac_try_echo="\":$LINENO: $ac_try\""
  echo "$ac_try_echo" >&5
@@ -38,6 +71,37 @@ Upstream: https://github.com/utwente-fmt/ltsmin/issues/203
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -19938,10 +19941,10 @@ fi # as_fn_append
+ # Perform arithmetic evaluation on the ARGs, and store the result in the
+ # global $as_val. Take advantage of shells that can avoid forks. The arguments
+ # must be portable across $(()) and expr.
+-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++if (eval "test \$( ( 1 + 1 ) ) = 2") 2>/dev/null; then :
+   eval 'as_fn_arith ()
+   {
+-    as_val=$(( $* ))
++    as_val=$( ( $* ) )
+   }'
+ else
+   as_fn_arith ()
+@@ -21135,7 +21138,7 @@ test 0 -eq $? || _lt_function_replace_fa
+   sed -e '/^func_arith ()$/,/^} # func_arith /c\
+ func_arith ()\
+ {\
+-    func_arith_result=$(( $* ))\
++    func_arith_result=$( ( $* ) )\
+ } # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+   && mv -f "$cfgfile.tmp" "$cfgfile" \
+     || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+@@ -21373,7 +21376,7 @@ $as_echo_n "checking whether -export-dyn
+ if ${acx_cv_cc_export_dynamic+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  acx_cv_cc_export_dynamic="$((./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh)"
++  acx_cv_cc_export_dynamic="$( (./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh)"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_cc_export_dynamic" >&5
 @@ -28956,7 +28959,7 @@ as_fn_error $? "no acceptable atomic ope
  See \`config.log' for more details" "$LINENO" 5; }
  fi
@@ -47,3 +111,25 @@ Upstream: https://github.com/utwente-fmt/ltsmin/issues/203
  
  $as_echo "#define HAVE_LIBSPG /**/" >>confdefs.h
  
+@@ -31434,10 +31437,10 @@ fi # as_fn_append
+ # Perform arithmetic evaluation on the ARGs, and store the result in the
+ # global $as_val. Take advantage of shells that can avoid forks. The arguments
+ # must be portable across $(()) and expr.
+-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++if (eval "test \$( ( 1 + 1 ) ) = 2") 2>/dev/null; then :
+   eval 'as_fn_arith ()
+   {
+-    as_val=$(( $* ))
++    as_val=$( ( $* ) )
+   }'
+ else
+   as_fn_arith ()
+@@ -33543,7 +33548,7 @@ test 0 -eq $? || _lt_function_replace_fa
+   sed -e '/^func_arith ()$/,/^} # func_arith /c\
+ func_arith ()\
+ {\
+-    func_arith_result=$(( $* ))\
++    func_arith_result=$( ( $* ) )\
+ } # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+   && mv -f "$cfgfile.tmp" "$cfgfile" \
+     || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")


Home | Main Index | Thread Index | Old Index