From 0c825014041831a797a0c730aff1b989fd60a88e Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 7 Mar 2008 08:36:47 -0600 Subject: [PATCH 1/6] update factor.sh for *bsd --- misc/factor.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/misc/factor.sh b/misc/factor.sh index afcccaef09..b86e486086 100755 --- a/misc/factor.sh +++ b/misc/factor.sh @@ -96,6 +96,8 @@ check_installed_programs() { ensure_program_installed cut case $OS in netbsd) ensure_program_installed gmake;; + openbsd) ensure_program_installed gmake;; + freebsd) ensure_program_installed gmake;; esac check_gcc_version } @@ -265,6 +267,8 @@ cd_factor() { invoke_make() { case $OS in netbsd) make='gmake';; + freebsd) make='gmake';; + openbsd) make='gmake';; *) make='make';; esac $make $* From 9c95192082c595ed2062086f48f0a27a0fd54c5c Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 11 Mar 2008 13:05:17 -0500 Subject: [PATCH 2/6] use egcc on openbsd --- misc/factor.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/misc/factor.sh b/misc/factor.sh index b86e486086..04bf73f14d 100755 --- a/misc/factor.sh +++ b/misc/factor.sh @@ -56,7 +56,7 @@ check_ret() { check_gcc_version() { echo -n "Checking gcc version..." - GCC_VERSION=`gcc --version` + GCC_VERSION=`$CC --version` check_ret gcc if [[ $GCC_VERSION == *3.3.* ]] ; then echo "bad!" @@ -96,9 +96,18 @@ check_installed_programs() { ensure_program_installed cut case $OS in netbsd) ensure_program_installed gmake;; - openbsd) ensure_program_installed gmake;; freebsd) ensure_program_installed gmake;; + openbsd) ensure_program_installed egcc; + ensure_program_installed gmake; + CC=egcc;; + *) CC=gcc;; esac + case $OS in + # winnt) FACTOR_BINARY=factor-nt;; + # macosx) FACTOR_BINARY=./Factor.app/Contents/MacOS/factor;; + *) FACTOR_BINARY=factor;; + esac + check_gcc_version } @@ -107,7 +116,7 @@ check_library_exists() { GCC_OUT=factor-library-test.out echo -n "Checking for library $1..." echo "int main(){return 0;}" > $GCC_TEST - gcc $GCC_TEST -o $GCC_OUT -l $1 + $CC $GCC_TEST -o $GCC_OUT -l $1 if [[ $? -ne 0 ]] ; then echo "not found!" echo "Warning: library $1 not found." From 4bb3128bfbf18fc6c56da8c4261504d83885a251 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 11 Mar 2008 15:24:26 -0500 Subject: [PATCH 3/6] add check for gcc --- misc/factor.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/factor.sh b/misc/factor.sh index 04bf73f14d..efd1bc64ea 100755 --- a/misc/factor.sh +++ b/misc/factor.sh @@ -244,6 +244,7 @@ set_build_info() { } find_build_info() { + ensure_program_installed egcc gcc find_os find_architecture find_word_size From 00ed2c4d94640e4703094c1b64e8e9e5aed85d43 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 11 Mar 2008 20:23:22 -0500 Subject: [PATCH 4/6] add some usings --- extra/db/sql/sql-tests.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/db/sql/sql-tests.factor b/extra/db/sql/sql-tests.factor index 2133b0e36c..c490ace770 100644 --- a/extra/db/sql/sql-tests.factor +++ b/extra/db/sql/sql-tests.factor @@ -1,4 +1,4 @@ -USING: kernel db.sql ; +USING: kernel namespaces db.sql sequences math ; IN: db.sql.tests TUPLE: person name age ; From 8d198a8578849232fa6dc1c3363d35f77c805555 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 11 Mar 2008 15:44:50 -0500 Subject: [PATCH 5/6] make factor.sh work on dragonflybsd fix factor.sh update --- misc/factor.sh | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/misc/factor.sh b/misc/factor.sh index efd1bc64ea..bc212af041 100755 --- a/misc/factor.sh +++ b/misc/factor.sh @@ -85,29 +85,35 @@ set_md5sum() { fi } +set_gcc() { + case $OS in + openbsd) ensure_program_installed egcc; CC=egcc;; + *) CC=gcc;; + esac +} + +set_make() { + case $OS in + netbsd) MAKE='gmake';; + freebsd) MAKE='gmake';; + openbsd) MAKE='gmake';; + dragonflybsd) MAKE='gmake';; + *) MAKE='make';; + esac + if ! [[ $MAKE -eq 'gmake' ]] ; then + ensure_program_installed gmake + fi +} + check_installed_programs() { ensure_program_installed chmod ensure_program_installed uname ensure_program_installed git ensure_program_installed wget curl ensure_program_installed gcc - ensure_program_installed make + ensure_program_installed make gmake ensure_program_installed md5sum md5 ensure_program_installed cut - case $OS in - netbsd) ensure_program_installed gmake;; - freebsd) ensure_program_installed gmake;; - openbsd) ensure_program_installed egcc; - ensure_program_installed gmake; - CC=egcc;; - *) CC=gcc;; - esac - case $OS in - # winnt) FACTOR_BINARY=factor-nt;; - # macosx) FACTOR_BINARY=./Factor.app/Contents/MacOS/factor;; - *) FACTOR_BINARY=factor;; - esac - check_gcc_version } @@ -166,6 +172,7 @@ find_os() { *NetBSD*) OS=netbsd;; *FreeBSD*) OS=freebsd;; *OpenBSD*) OS=openbsd;; + *DragonFly*) OS=dragonflybsd;; esac } @@ -244,7 +251,6 @@ set_build_info() { } find_build_info() { - ensure_program_installed egcc gcc find_os find_architecture find_word_size @@ -275,14 +281,8 @@ cd_factor() { } invoke_make() { - case $OS in - netbsd) make='gmake';; - freebsd) make='gmake';; - openbsd) make='gmake';; - *) make='make';; - esac - $make $* - check_ret $make + $MAKE $* + check_ret $MAKE } make_clean() { @@ -347,6 +347,8 @@ maybe_download_dlls() { get_config_info() { find_build_info + set_gcc + set_make check_installed_programs check_libraries } From efa82400b82cc6eeba7fd3dfb68f38977db954a3 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 11 Mar 2008 20:47:07 -0500 Subject: [PATCH 6/6] output CC and MAKE variables --- misc/factor.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/misc/factor.sh b/misc/factor.sh index bc212af041..b96aa8d24b 100755 --- a/misc/factor.sh +++ b/misc/factor.sh @@ -224,6 +224,8 @@ echo_build_info() { echo GIT_PROTOCOL=$GIT_PROTOCOL echo GIT_URL=$GIT_URL echo DOWNLOADER=$DOWNLOADER + echo CC=$CC + echo MAKE=$MAKE } set_build_info() { @@ -257,6 +259,8 @@ find_build_info() { set_factor_binary set_build_info set_downloader + set_gcc + set_make echo_build_info } @@ -347,8 +351,6 @@ maybe_download_dlls() { get_config_info() { find_build_info - set_gcc - set_make check_installed_programs check_libraries }