From 12d6f2f5329bb2c316c388258f486040b3ea502a Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 24 Mar 2015 13:28:34 +0100 Subject: [PATCH 1/4] scripts/Programming/Tcl/build: compile with system compiler --- scripts/Programming/Tcl/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/Programming/Tcl/build b/scripts/Programming/Tcl/build index 402004d..6aa8add 100755 --- a/scripts/Programming/Tcl/build +++ b/scripts/Programming/Tcl/build @@ -21,7 +21,9 @@ function em.post_install() { { cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; }; } +# use system's cc +declare CC=cc + em.add_to_family 'Programming' em.set_docfiles 'license.terms' 'README' -em.set_build_dependencies "${COMPILER}" em.make_all From 87ffe565a1587260d50c4d6b73123d5e8ab613fb Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 24 Mar 2015 13:29:20 +0100 Subject: [PATCH 2/4] scripts/Programming/Tk/build: added --- scripts/Programming/Tk/build | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 scripts/Programming/Tk/build diff --git a/scripts/Programming/Tk/build b/scripts/Programming/Tk/build new file mode 100755 index 0000000..9ca58c4 --- /dev/null +++ b/scripts/Programming/Tk/build @@ -0,0 +1,32 @@ +#!/bin/bash + +source "$(dirname $0)/../../../lib/libem.bash" + +function em.configure() { + case ${OS} in + Linux ) + srcdir="${MODULE_SRCDIR}/unix" + ;; + Darwin ) + srcdir="${MODULE_SRCDIR}/macosx" + ;; + esac + "${srcdir}"/configure \ + --prefix="${PREFIX}" \ + --with-tcl=${TCL_PREFIX}/lib \ + --enable-shared=no \ + || exit 1 +} + +function em.post_install() { + : + #{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; }; +} + +# use system's cc +declare CC=cc + +em.add_to_family 'Programming' +em.set_build_dependencies 'Tcl' +em.set_docfiles 'license.terms' 'README' +em.make_all From 38f3a237f2278194fe96205f953689fb6718e26b Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 24 Mar 2015 13:30:01 +0100 Subject: [PATCH 3/4] scripts/Tools/git/build: run-time dependencies 'Tcl' and 'Tk' added --- scripts/Tools/git/build | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/Tools/git/build b/scripts/Tools/git/build index ed9c700..52423c3 100755 --- a/scripts/Tools/git/build +++ b/scripts/Tools/git/build @@ -16,6 +16,7 @@ function em.build() { } em.add_to_family 'Tools' +em.set_runtime_dependencies 'Tcl' 'Tk' em.set_docfiles 'COPYING' 'README' em.make_all From 4f9229e8f13674313839cf771bbf4b948a68bd9d Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 24 Mar 2015 13:30:59 +0100 Subject: [PATCH 4/4] scripts/Tools/git/with_modules: added --- scripts/Tools/git/with_modules | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 scripts/Tools/git/with_modules diff --git a/scripts/Tools/git/with_modules b/scripts/Tools/git/with_modules new file mode 100644 index 0000000..70974ad --- /dev/null +++ b/scripts/Tools/git/with_modules @@ -0,0 +1,2 @@ +Tcl/8.6.4 +Tk/8.6.4