Merge pull request #509 from fosslinux/bc-update

Bc update
fosslinux · Feb 16, 2025 · ec017e9 · ec017e9
2 parents 01257b3 + 43b8f4a
commit ec017e9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/parts.rst b/parts.rst
@@ -798,7 +798,7 @@ ed 1.4
 ``ed`` is a very basic line editor. This is the last version that is not distributed
 in ``.tar.lz`` format. ``ed`` is used by ``bc`` build scripts.
 
-bc 1.07.1
+bc 1.08.1
 =========
 
 ``bc`` is a console based calculator that is sometime used in scripts. We need ``bc``

diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
@@ -21,7 +21,7 @@ e8ff13753943e43972a8cf1672819f001718ed38e5497cf7b554c21a507ba22b  automake-1.7.8
 9922651b64ad2e29b944082f26db223008220155048f25d64df1f6d82071ff1c  automake-1.8.5_0.tar.bz2
 c5807850a377e4bb9aa4121d9781d145bdd80327626a9419630a75ce2c8d9c71  automake-1.9.6_0.tar.bz2
 65427597c185f4a034525217cb108e004c8d2e2dfc824223d2b680e9db338d1c  bash-5.2.15_0.tar.bz2
-7db49c9b024821d82d15afc0db2b1af8d89700101495a9cbadf471813ba5fa55  bc-1.07.1_0.tar.bz2
+40092149bdd6859baaa737ab992dac1c655770ef91847af24b94b6127b6b00c0  bc-1.08.1_0.tar.bz2
 3be27e61642ea7d3d4d50a396ab0316ee66b3c469cd38a0a7600e92a9d5022d2  binutils-2.30_0.tar.bz2
 43bed356bf52b3d52ef62b63adbeb3bbd1e763e93d0ffd3edb5c75354842f171  binutils-2.41_0.tar.bz2
 33e192d498f8fb3015a6b5407f06946f1e1dfd575911377c4201bd4611c72a3f  binutils-2.41_1.tar.bz2

diff --git a/steps/bc-1.07.1/sources b/steps/bc-1.07.1/sources
diff --git a/steps/bc-1.07.1/pass1.sh → steps/bc-1.08.1/pass1.sh b/steps/bc-1.07.1/pass1.sh → steps/bc-1.08.1/pass1.sh
@@ -1,14 +1,18 @@
 # SPDX-FileCopyrightText: © 2023 Andrius Štikonas <[email protected]>
+# SPDX-FileCopyrightText: 2025 fosslinux <[email protected]>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    # Remove bison generated files
-    rm bc/bc.c bc/bc.h
-    rm bc/scan.c
+    # Remove bison/flex generated files
+    rm bc/bc.c bc/bc.h bc/scan.c
 
     # Skip documentation
     sed -i 's/ doc//' Makefile.am
+    rm doc/*.info
+
+    # Pregenerated header
+    rm bc/libmath.h
 
     # Rebuild configure script
     AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
@@ -18,3 +22,8 @@ src_configure() {
     ./configure --prefix="${PREFIX}" \
         --build=i386-unknown-linux-musl
 }
+
+src_compile() {
+    # racey when building libmath.h
+    make -j1 PREFIX="${PREFIX}"
+}
diff --git a/steps/bc-1.08.1/sources b/steps/bc-1.08.1/sources
@@ -0,0 +1 @@
+https://mirrors.kernel.org/gnu/bc/bc-1.08.1.tar.xz 515430115b3334c636317503460a0950dff79940aa3259ce2c1aa67c2881d023 
diff --git a/steps/manifest b/steps/manifest
@@ -121,7 +121,7 @@ build: dhcpcd-10.0.1
 build: kbd-1.15
 build: make-3.82
 build: ed-1.4
-build: bc-1.07.1
+build: bc-1.08.1
 define: BUILD_LINUX = ( CHROOT == False || BUILD_KERNELS == True )
 build: kexec-linux-1.0.0 ( BUILD_LINUX == True )
 build: kexec-tools-2.0.22 ( BUILD_LINUX == True )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		https://mirrors.kernel.org/gnu/bc/bc-1.08.1.tar.xz 515430115b3334c636317503460a0950dff79940aa3259ce2c1aa67c2881d023