From d224f68b26282c0bf90d83426e9ea66abedbbc50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Fri, 6 Nov 2015 18:12:32 +0100 Subject: [PATCH] candi: removes generic linux build / devel project --- linux-devel-suite/packages/bzip2.package | 21 -------- linux-devel-suite/packages/gmp.package | 7 --- .../packages/linux-devel-suite.package | 48 ------------------- linux-devel-suite/packages/mpc.package | 7 --- linux-devel-suite/packages/mpfr.package | 6 --- linux-devel-suite/packages/zlib.package | 16 ------- linux-devel-suite/patches/bzip2-1.0.6.patch | 32 ------------- .../platforms/supported/rhel7.platform | 26 ---------- project-linux-devel-suite.cfg | 24 ---------- 9 files changed, 187 deletions(-) delete mode 100644 linux-devel-suite/packages/bzip2.package delete mode 100644 linux-devel-suite/packages/gmp.package delete mode 100644 linux-devel-suite/packages/linux-devel-suite.package delete mode 100644 linux-devel-suite/packages/mpc.package delete mode 100644 linux-devel-suite/packages/mpfr.package delete mode 100644 linux-devel-suite/packages/zlib.package delete mode 100644 linux-devel-suite/patches/bzip2-1.0.6.patch delete mode 100644 linux-devel-suite/platforms/supported/rhel7.platform delete mode 100644 project-linux-devel-suite.cfg diff --git a/linux-devel-suite/packages/bzip2.package b/linux-devel-suite/packages/bzip2.package deleted file mode 100644 index 1106b46..0000000 --- a/linux-devel-suite/packages/bzip2.package +++ /dev/null @@ -1,21 +0,0 @@ -NAME=bzip2-1.0.6 -SOURCE=http://www.bzip.org/1.0.6/ -PACKING=.tar.gz -DOWNLOADER=curl -CHECKSUM=00b516f4704d4a7cb50a1d97e6e8e15b -BUILDCHAIN=custom - -package_specific_build () { - cp -rf ${UNPACK_PATH}/${NAME}/* . - - # patch the Makefile - patch -p1 --forward < ${ORIG_DIR}/${PROJECT}/patches/bzip2-1.0.6.patch || true - - # compile bzip2 - make install -} - -package_specific_register () { - export BZIP2_INCLUDE=${INSTALL_PATH}/include - export BZIP2_LIBPATH=${INSTALL_PATH}/lib -} diff --git a/linux-devel-suite/packages/gmp.package b/linux-devel-suite/packages/gmp.package deleted file mode 100644 index 9080a7e..0000000 --- a/linux-devel-suite/packages/gmp.package +++ /dev/null @@ -1,7 +0,0 @@ -VERSION=6.0.0a -NAME=gmp-${VERSION} -EXTRACTSTO=gmp-6.0.0 -PACKING=.tar.bz2 -SOURCE=https://gmplib.org/download/gmp/ -CHECKSUM=b7ff2d88cae7f8085bd5006096eed470 -BUILDCHAIN=autotools diff --git a/linux-devel-suite/packages/linux-devel-suite.package b/linux-devel-suite/packages/linux-devel-suite.package deleted file mode 100644 index d6d0c30..0000000 --- a/linux-devel-suite/packages/linux-devel-suite.package +++ /dev/null @@ -1,48 +0,0 @@ -NAME=linux-devel-suite -VERSION=1.0.0 -BUILDCHAIN=ignore - -MODULEFILE_PATH=${INSTALL_PATH}/share/modulefiles/${NAME}/ -CONFIG_FILE=${MODULEFILE_PATH}/${VERSION} -CURRENT_MODULES=$(echo ${LOADEDMODULES} | sed 's/:/\ /') - -# ********************************************************************************** -package_specific_conf() { - # Generate modulefile - - mkdir -p ${MODULEFILE_PATH} - rm -f $CONFIG_FILE - echo "#%Module 1.0 -# -# linux-devel-suite module for use with 'environment-modules' package: -# - -#module load ${CURRENT_MODULES} - -# Define prefix so PATH and MANPATH can be updated. -setenv INSTALL_PATH ${INSTALL_PATH} -prepend-path PATH ${INSTALL_PATH}/bin -prepend-path LD_LIBRARY_PATH ${INSTALL_PATH}/lib -prepend-path DYLD_LIBRARY_PATH ${INSTALL_PATH}/lib -prepend-path MANPATH ${INSTALL_PATH}/share/man -prepend-path CPLUS_INCLUDE_PATH ${INSTALL_PATH}/include -" >> $CONFIG_FILE - - echo - echo "${NAME} has now been installed in" - echo - cecho ${GOOD} " ${INSTALL_PATH}" - echo - echo "To update your environment variables, use the created modulefile:" - echo - cecho ${GOOD} " $CONFIG_FILE" - echo - - echo "To update your environment variables, run the following command:" - echo - cecho ${GOOD} " source $CONFIG_FILE" - echo - echo "For future reference, we recommend that you add this command to your" - echo "configuration (.bashrc, .profile or similar)." - echo -} diff --git a/linux-devel-suite/packages/mpc.package b/linux-devel-suite/packages/mpc.package deleted file mode 100644 index b75dd65..0000000 --- a/linux-devel-suite/packages/mpc.package +++ /dev/null @@ -1,7 +0,0 @@ -VERSION=1.0.3 -NAME=mpc-${VERSION} -PACKING=.tar.gz -DOWNLOADER=curl -SOURCE=ftp://ftp.gnu.org/gnu/mpc/ -CHECKSUM=d6a1d5f8ddea3abd2cc3e98f58352d26 -BUILDCHAIN=autotools diff --git a/linux-devel-suite/packages/mpfr.package b/linux-devel-suite/packages/mpfr.package deleted file mode 100644 index a37087d..0000000 --- a/linux-devel-suite/packages/mpfr.package +++ /dev/null @@ -1,6 +0,0 @@ -VERSION=3.1.3 -NAME=mpfr-${VERSION} -PACKING=.tar.bz2 -SOURCE=http://www.mpfr.org/mpfr-current/ -CHECKSUM=5fdfa3cfa5c86514ee4a241a1affa138 -BUILDCHAIN=autotools diff --git a/linux-devel-suite/packages/zlib.package b/linux-devel-suite/packages/zlib.package deleted file mode 100644 index e3dd47d..0000000 --- a/linux-devel-suite/packages/zlib.package +++ /dev/null @@ -1,16 +0,0 @@ -VERSION=1.2.8 -NAME=zlib-${VERSION} -SOURCE=http://zlib.net/ -PACKING=.tar.gz -CHECKSUM=44d667c142d7cda120332623eab69f40 -BUILDCHAIN=custom - -package_specific_build () { - cp -rf ${UNPACK_PATH}/${NAME}/* . - ./configure --prefix=${INSTALL_PATH} - make install -} - -package_specific_register () { - export ZLIB_DIR=${INSTALL_PATH} -} diff --git a/linux-devel-suite/patches/bzip2-1.0.6.patch b/linux-devel-suite/patches/bzip2-1.0.6.patch deleted file mode 100644 index 6257c72..0000000 --- a/linux-devel-suite/patches/bzip2-1.0.6.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -u -r -N bzip2-1.0.6-origin/Makefile bzip2-1.0.6/Makefile ---- bzip2-1.0.6-origin/Makefile 2015-06-11 10:00:55.410362529 +0200 -+++ bzip2-1.0.6/Makefile 2015-06-22 12:52:50.882578523 +0200 -@@ -11,20 +11,25 @@ - # This program is released under the terms of the license contained - # in the file LICENSE. - # ------------------------------------------------------------------ -+# -+# This file has been modified by Bruno Turcksin to be used by candi (2015). -+# This file has been modified by Uwe Köcher to be used by candi (2015). -+# - - SHELL=/bin/sh - - # To assist in cross-compiling --CC=gcc -+#CC=gcc - AR=ar - RANLIB=ranlib --LDFLAGS= -+#LDFLAGS= - - BIGFILES=-D_FILE_OFFSET_BITS=64 - CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) - - # Where you want it installed when you do 'make install' --PREFIX=/usr/local -+#PREFIX=/usr/local -+PREFIX=${INSTALL_PATH} - - - OBJS= blocksort.o \ diff --git a/linux-devel-suite/platforms/supported/rhel7.platform b/linux-devel-suite/platforms/supported/rhel7.platform deleted file mode 100644 index 9763d11..0000000 --- a/linux-devel-suite/platforms/supported/rhel7.platform +++ /dev/null @@ -1,26 +0,0 @@ -# RHEL 7 - -# Install common packages for linux clusters. -# This build script assumes that you have several packages already -# installed via RHEL's yum using the following command: -# -# su -c 'yum install -y @development-tools gcc-c++ \ -# glibc glibc-devel ' -# -# Provided packages: -# bzip2 -# zlib -# gmp, mpfr, mpc -# -## - -# Define the packages this platform needs -PACKAGES=( -once:bzip2 -once:zlib -once:gmp -once:mpfr -once:mpc -skip:linux-devel-suite -) - diff --git a/project-linux-devel-suite.cfg b/project-linux-devel-suite.cfg deleted file mode 100644 index 331df72..0000000 --- a/project-linux-devel-suite.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Global configuration variables go here. You will want to tweak this -# file to suit your needs. If you want to keep local changes that are -# not overwritten by repository updates, those can be written -# to local.cfg instead (entries there will override those in this file). - -# Meta-project to build -PROJECT=linux-devel-suite - -# How many processes would you like to build using? -PROCS=1 - -PREFIX_PATH=~/apps/candi - -# Where do you want the downloaded source files to go? -DOWNLOAD_PATH=${PREFIX_PATH}/src - -# Where do you want to unpack source files to go? -UNPACK_PATH=${PREFIX_PATH}/unpack - -# Where do you want the build files to go? -BUILD_PATH=${PREFIX_PATH}/${PROJECT}-build - -# Where do you want the compiled software installed? -INSTALL_PATH=${PREFIX_PATH}/${PROJECT} -- 2.39.5