From 1fc325ea96bb2c0a4d93f5e7215be1b177b9633b Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 19:14:56 +0200 Subject: [PATCH] fix build-scripts according changes in version 0.99.15 --- Tcl/build | 11 ++++++----- bash/build | 12 +++--------- coreutils/build | 11 ++--------- getopt/build | 14 +++++--------- gettext/build | 38 +++++++++++++++++--------------------- modules/build | 14 +++++++------- 6 files changed, 40 insertions(+), 60 deletions(-) diff --git a/Tcl/build b/Tcl/build index 9775503..7f4f4da 100755 --- a/Tcl/build +++ b/Tcl/build @@ -1,13 +1,16 @@ #!/usr/bin/env modbuild -SOURCE_URL="ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl$V-src.tar.gz" +pbuild::add_to_group 'Tools' +pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl$V-src.tar.gz" +pbuild::set_docfiles 'license.terms' 'README' + pbuild::configure() { case ${OS} in Linux ) - srcdir="${MODULE_SRCDIR}/unix" + srcdir="${SRC_DIR}/unix" ;; Darwin ) - srcdir="${MODULE_SRCDIR}/macosx" + srcdir="${SRC_DIR}/macosx" ;; esac "${srcdir}"/configure \ @@ -21,6 +24,4 @@ pbuild::post_install() { { cd "${PREFIX}"/sbin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; }; } -pbuild::add_to_group 'Tools' -pbuild::set_docfiles 'license.terms' 'README' pbuild::make_all diff --git a/bash/build b/bash/build index 33b77ae..df35241 100755 --- a/bash/build +++ b/bash/build @@ -1,13 +1,7 @@ #!/usr/bin/env modbuild -SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz" - -pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ - --prefix="${PREFIX}" \ - --bindir="${PREFIX}/sbin" \ - || exit 1 -} - pbuild::add_to_group 'Tools' +pbuild::set_download_url "https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz" +pbuild::add_configure_args "--bindir=${PREFIX}/sbin" + pbuild::make_all diff --git a/coreutils/build b/coreutils/build index 6e70051..4382de4 100755 --- a/coreutils/build +++ b/coreutils/build @@ -1,13 +1,6 @@ #!/usr/bin/env modbuild -SOURCE_URL="http://ftp.gnu.org/gnu/coreutils/$P-$V.tar.xz" +pbuild::set_download_url "http://ftp.gnu.org/gnu/coreutils/$P-$V.tar.xz" +pbuild::add_configure_args "--bindir=${PREFIX}/sbin" -pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ - --prefix="${PREFIX}" \ - --bindir="${PREFIX}"/sbin \ - || exit 1 -} - -pbuild::add_to_group 'Tools' pbuild::make_all diff --git a/getopt/build b/getopt/build index e636512..7a2dd6a 100755 --- a/getopt/build +++ b/getopt/build @@ -1,16 +1,16 @@ #!/usr/bin/env modbuild -SOURCE_URL="http://frodo.looijaard.name/system/files/software/getopt/getopt-1.1.6.tar.gz" +pbuild::add_to_group 'Tools' +pbuild::set_download_url "http://frodo.looijaard.name/system/files/software/getopt/getopt-1.1.6.tar.gz" +pbuild::compile_in_sourcetree -pbuild::patch_sources_Linux() { - patch -p1 < "${BUILD_BLOCK_DIR}/Makefile.patch" -} +pbuild::add_patch_Linux "Makefile.patch" pbuild::configure() { : } -pbuild::build() { +pbuild::compile() { declare -x C_INCLUDE_PATH="${PREFIX}/include" declare -x LIBRARY_PATH="${PREFIX}/lib" case ${OS} in @@ -22,12 +22,10 @@ pbuild::build() { ;; esac - cd "${MODULE_SRCDIR}" make -e all } pbuild::install() { - cd "${MODULE_SRCDIR}" declare -x DESTDIR="${PREFIX}" declare -x prefix='' make -e install @@ -36,11 +34,9 @@ pbuild::install() { } pbuild::cleanup_build() { - cd "${MODULE_SRCDIR}" make -e realclean } -pbuild::add_to_group 'Tools' pbuild::make_all # Local Variables: diff --git a/gettext/build b/gettext/build index 6fc0e93..bb743bd 100755 --- a/gettext/build +++ b/gettext/build @@ -1,25 +1,21 @@ #!/usr/bin/env modbuild -SOURCE_URL="https://ftp.gnu.org/pub/gnu/$P/$P-$V.tar.gz" - -pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ - --prefix="${PREFIX}" \ - --bindir="${PREFIX}/sbin" \ - --disable-java \ - --disable-threads \ - --disable-shared \ - --enable-relocatable \ - --disable-openmp \ - --disable-acl \ - --disable-curses \ - --with-included-gettext \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --with-included-libxml \ - --with-pic=yes \ - || exit 1 -} - pbuild::add_to_group 'Tools' +pbuild::set_download_url "https://ftp.gnu.org/pub/gnu/$P/$P-$V.tar.gz" + +pbuild::add_configure_args "--prefix=${PREFIX}" +pbuild::add_configure_args "--bindir=${PREFIX}/sbin" +pbuild::add_configure_args "--disable-java" +pbuild::add_configure_args "--disable-threads" +pbuild::add_configure_args "--disable-shared" +pbuild::add_configure_args "--enable-relocatable" +pbuild::add_configure_args "--disable-openmp" +pbuild::add_configure_args "--disable-acl" +pbuild::add_configure_args "--disable-curses" +pbuild::add_configure_args "--with-included-gettext" +pbuild::add_configure_args "--without-libiconv-prefix" +pbuild::add_configure_args "--without-libintl-prefix" +pbuild::add_configure_args "--with-included-libxml" +pbuild::add_configure_args "--with-pic=yes" + pbuild::make_all diff --git a/modules/build b/modules/build index d7a4335..f23a9a5 100755 --- a/modules/build +++ b/modules/build @@ -1,6 +1,10 @@ #!/usr/bin/env modbuild -SOURCE_URL="https://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2" +# use system gcc to compile +declare -rx CC=gcc + +pbuild::add_to_group 'Tools' +pbuild::set_download_url "https://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2" TCL_DIR="${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}" @@ -15,7 +19,7 @@ pbuild::configure() { declare -x LIBS="-lz -framework CoreFoundation" ;; esac - CPPFLAGS="-DUSE_INTERP_ERRORLINE" "${MODULE_SRCDIR}"/configure \ + CPPFLAGS="-DUSE_INTERP_ERRORLINE" "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --exec-prefix="${PREFIX}" \ --with-module-path="${PMODULES_ROOT}/Tools/${PMODULES_MODULEFILES_DIR}" \ @@ -37,7 +41,7 @@ pbuild::post_install() { rmdir ${PREFIX}/Modules/share/man rmdir ${PREFIX}/Modules/share rmdir ${PREFIX}/Modules - cp -v "${MODULE_BUILDDIR}/modulecmd" "${PREFIX}/libexec/modulecmd.bin" || exit 1 + cp -v "${BUILD_DIR}/modulecmd" "${PREFIX}/libexec/modulecmd.bin" || exit 1 } # fake module command @@ -45,10 +49,6 @@ module() { : } -# use system gcc to compile -declare -rx CC=gcc - -pbuild::add_to_group 'Tools' pbuild::make_all # Local Variables: