]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
bc: update to 1.07.1
authorMarcel Lorenz <marcel.lorenz@ipfire.org>
Tue, 6 Jun 2017 08:02:11 +0000 (10:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 7 Jun 2017 08:55:27 +0000 (09:55 +0100)
https://www.gnu.org/software/bc/

Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/rootfiles/common/bc
lfs/bc

index 145c177897dc1f200939b72778401f780b904b7a..2e983a862c6a8cde7a9613972ff112f9f9c3418d 100644 (file)
@@ -1,6 +1,6 @@
 usr/bin/bc
 usr/bin/dc
-#usr/info/bc.info
-#usr/info/dc.info
-#usr/man/man1/bc.1
-#usr/man/man1/dc.1
+#usr/share/info/bc.info
+#usr/share/info/dc.info
+#usr/share/man/man1/bc.1
+#usr/share/man/man1/dc.1
diff --git a/lfs/bc b/lfs/bc
index 28b27cb16254443ff3f4e0f8c6639b48a316b822..51dd084194b6ac8f3ec877972b6296530530ce3e 100644 (file)
--- a/lfs/bc
+++ b/lfs/bc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org>                       #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.06
+VER        = 1.07.1
 
 THISAPP    = bc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d44b5dddebd8a7a7309aea6c36fda117
+$(DL_FILE)_MD5 = cda93857418655ea43590736fc3ca9fc
 
 install : $(TARGET)
 
@@ -69,12 +69,8 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -i '/PROTO.*readline/d' bc/scan.l
-       cd $(DIR_APP) && sed -i '/flex -I8/s/8//' configure
-       cd $(DIR_APP) && sed -i '/stdlib/a #include <string.h>' lib/number.c
-       cd $(DIR_APP) && sed -i 's/program.*save/static &/' bc/load.c
-       cd $(DIR_APP) && ./configure --prefix=/usr --with-readline
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr --with-readline --mandir=/usr/share/man --infodir=/usr/share/info
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)