From b625ac2ec211879ccec04ba2e0d02ed87de78712 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 14 Oct 2014 15:00:08 +0200 Subject: [PATCH] bc: minor fixes. * get tests running. --- sys-devel/bc/bc-1.06.recipe | 5 ++- sys-devel/bc/patches/bc-1.06.patch | 12 ------- sys-devel/bc/patches/bc-1.06.patchset | 46 +++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 13 deletions(-) delete mode 100644 sys-devel/bc/patches/bc-1.06.patch create mode 100644 sys-devel/bc/patches/bc-1.06.patchset diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe index b6dfbdef9..f2a5fb1bb 100644 --- a/sys-devel/bc/bc-1.06.recipe +++ b/sys-devel/bc/bc-1.06.recipe @@ -22,6 +22,7 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion + lib:libfl >= 2 " BUILD_REQUIRES=" @@ -52,5 +53,7 @@ INSTALL() TEST() { - timetest + make check + cd Test + ./timetest } diff --git a/sys-devel/bc/patches/bc-1.06.patch b/sys-devel/bc/patches/bc-1.06.patch deleted file mode 100644 index aa3420d14..000000000 --- a/sys-devel/bc/patches/bc-1.06.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN bc-1.06/Test/timetest bc-1.06-haiku/Test/timetest ---- bc-1.06/Test/timetest 2000-07-07 23:34:10.023592960 +0000 -+++ bc-1.06-haiku/Test/timetest 2010-12-13 09:35:03.000000000 +0000 -@@ -2,7 +2,7 @@ - # - # Time the functions. - # --SYSBC=/usr/bin/bc -+SYSBC=/boot/common/bin/bc - if [ x$BC = x ] ; then - BC=../bc/bc - fi diff --git a/sys-devel/bc/patches/bc-1.06.patchset b/sys-devel/bc/patches/bc-1.06.patchset new file mode 100644 index 000000000..d924647f3 --- /dev/null +++ b/sys-devel/bc/patches/bc-1.06.patchset @@ -0,0 +1,46 @@ +From 0c328c9104371b5e135c130ee87c410830f5689b Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 14 Oct 2014 14:54:27 +0200 +Subject: applying patch bc-1.06.patch + + +diff --git a/Test/timetest b/Test/timetest +index 1a4d0ea..46896fc 100755 +--- a/Test/timetest ++++ b/Test/timetest +@@ -2,7 +2,7 @@ + # + # Time the functions. + # +-SYSBC=/usr/bin/bc ++SYSBC=/boot/common/bin/bc + if [ x$BC = x ] ; then + BC=../bc/bc + fi +-- +1.8.3.4 + + +From 3de7ccc77eff91b40e0a5b2332ad63c898e288a0 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 14 Oct 2014 14:59:13 +0200 +Subject: Fix some paths in timetest. + +/boot/common is gone. + +diff --git a/Test/timetest b/Test/timetest +index 46896fc..0b1ea8e 100755 +--- a/Test/timetest ++++ b/Test/timetest +@@ -2,7 +2,7 @@ + # + # Time the functions. + # +-SYSBC=/boot/common/bin/bc ++SYSBC=/bin/bc + if [ x$BC = x ] ; then + BC=../bc/bc + fi +-- +1.8.3.4 +