diff --git a/ThirdParty/rpmBuild/SPECS/gcc-4.8.4.spec b/ThirdParty/rpmBuild/SPECS/gcc-4.8.4.spec new file mode 100644 index 000000000..61259c549 --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/gcc-4.8.4.spec @@ -0,0 +1,194 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# foam-extend is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with foam-extend. If not, see . +# +# Script +# RPM spec file for gcc-4.8.4 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Martin Beaudoin, Hydro-Quebec, (2015) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in thi file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name gcc +%define release %{_WM_OPTIONS} +%define version 4.8.4 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: gcc +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.4 +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +%description +%{summary} + +%prep +%setup -q + +%build + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + + # Download prequisite libraries + ./contrib/download_prerequisites + + # Create working directory + mkdir ./objBuildDir + cd ./objBuildDir + +%ifos darwin + # Couple of fixes for OSX Yosemite and Xcode 6.3.1 + # See here : http://lists.gnu.org/archive/html/libtool-patches/2014-09/msg00001.html + # and here : https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63610 + # for the details. + # Hopefully, this will all be resolved soon before MACOSX_DEPLOYMENT_TARGET=10.11... + if [ "$MACOSX_DEPLOYMENT_TARGET" = "10.10" ] + then + export MACOSX_DEPLOYMENT_TARGET="10.9" + fi + + # Another necessary fix: + # Use 'bootstrap-debug' build configuration to force stripping of object + # files prior to comparison during bootstrap (broken by Xcode 6.3). + # Fix taken from HomeBrew and MacPorts projects + ../configure \ + --prefix=%{_installPrefix} \ + --enable-languages=c,c++ \ + --enable-shared \ + --with-build-config=bootstrap-debug \ + --disable-multilib +%else + ../configure \ + --prefix=%{_installPrefix} \ + --enable-languages=c,c++ \ + --enable-shared \ + --disable-multilib +%endif + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS + +%install + cd ./objBuildDir + make install DESTDIR=$RPM_BUILD_ROOT + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export GCC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +[ -d \$GCC_DIR/lib ] && _foamAddLib \$GCC_DIR/lib + +[ -d \$GCC_DIR/lib64 ] && _foamAddLib \$GCC_DIR/lib64 + +# Enable access to the package applications if present +[ -d \$GCC_DIR/bin ] && _foamAddPath \$GCC_DIR/bin +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv GCC_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +if ( -e \$GCC_DIR/lib ) then + _foamAddLib \$GCC_DIR/lib +endif + +if ( -e \$GCC_DIR/lib64 ) then + _foamAddLib \$GCC_DIR/lib64 +endif + +if ( -e \$GCC_DIR/bin ) then + _foamAddPath \$GCC_DIR/bin +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} diff --git a/ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec b/ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec index a56fe7459..e39054f17 100644 --- a/ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec +++ b/ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec @@ -94,42 +94,25 @@ Group: Development/Tools [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" - GMP_VERSION=gmp-6.0.0 - MPFR_VERSION=mpfr-3.1.2 - MPC_VERSION=mpc-1.0.3 - ISL_VERSION=isl-0.12.2 - CLOOG_VERSION=cloog-0.18.1 - - # Download dependency packages and add them as builtin components for gcc - #GMP - wget ftp://ftp.gnu.org/gnu/gmp/${GMP_VERSION}a.tar.xz - tar -xf ${GMP_VERSION}a.tar.xz - mv ${GMP_VERSION} gmp - - #MPFR - wget ftp://ftp.gnu.org/gnu/mpfr/$MPFR_VERSION.tar.gz - tar -xf $MPFR_VERSION.tar.gz - mv ${MPFR_VERSION} mpfr - - #MPC - wget ftp://ftp.gnu.org/gnu/mpc/$MPC_VERSION.tar.gz - tar -xf $MPC_VERSION.tar.gz - mv ${MPC_VERSION} mpc - - #ISL - wget ftp://gcc.gnu.org/pub/gcc/infrastructure/$ISL_VERSION.tar.bz2 - tar -xf $ISL_VERSION.tar.bz2 - mv ${ISL_VERSION} isl - - #CLOOG - wget ftp://gcc.gnu.org/pub/gcc/infrastructure/$CLOOG_VERSION.tar.gz - tar -xf $CLOOG_VERSION.tar.gz - mv ${CLOOG_VERSION} cloog + # Download prequisite libraries + ./contrib/download_prerequisites + # Create working directory mkdir ./objBuildDir cd ./objBuildDir %ifos darwin + # Couple of fixes for OSX Yosemite and Xcode 6.3.1 + # See here : http://lists.gnu.org/archive/html/libtool-patches/2014-09/msg00001.html + # and here : https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63610 + # for the details. + # Hopefully, this will all be resolved soon before MACOSX_DEPLOYMENT_TARGET=10.11... + if [ "$MACOSX_DEPLOYMENT_TARGET" = "10.10" ] + then + export MACOSX_DEPLOYMENT_TARGET="10.9" + fi + + # Another necessary fix: # Use 'bootstrap-debug' build configuration to force stripping of object # files prior to comparison during bootstrap (broken by Xcode 6.3). # Fix taken from HomeBrew and MacPorts projects diff --git a/etc/bashrc b/etc/bashrc index 6df99b384..bf37294c6 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -282,8 +282,10 @@ Darwin) ;; esac + # Using MacPorts + : ${MACOSX_MACPORTS_ROOT:='/opt/local/etc/macports'}; export MACOSX_MACPORTS_ROOT which -s port >/dev/null - if [ $? -eq "0" -a -d '/opt/local/etc/macports' ] + if [ $? -eq "0" ] && [ -d "$MACOSX_MACPORTS_ROOT" ] then if [ "$FOAM_VERBOSE" -a "$PS1" ] then @@ -382,8 +384,7 @@ Darwin) unset ruleDir ruleDirBase fi else - export WM_COMPILER=Gcc - export WM_MPLIB=OPENMPI + echo "Warning: You are not using MacPorts. Make sure your compilation and MPI environment is correctly initialized" fi # Make sure that binaries use the best features of the used OS-Version diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE index af6b3ae32..be8ba6bb8 100644 --- a/etc/prefs.csh-EXAMPLE +++ b/etc/prefs.csh-EXAMPLE @@ -170,6 +170,11 @@ # You can override your identifier using this environment variable #setenv CDASH_SUBMIT_LOCAL_HOST_ID choose_your_CDash_system_identifer +# Mac OS X MacPorts root directory. +# The default value is '/opt/local/etc/macports'. +# In order to disable the usage of MacPorts on Mac OSX, simply initialize this +# variable to a non-existing directory, or to a dummy value. +#setenv MACOSX_MACPORTS_ROOT="_not_using_" # ThirdParty packages: build control variables # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -177,8 +182,8 @@ # installation of the corresponding ThirdParty package # # For AllMake.stage1 -#setenv WM_THIRD_PARTY_USE_GCC_49 1 -#setenv WM_THIRD_PARTY_USE_GCC_48 1 +#setenv WM_THIRD_PARTY_USE_GCC_492 1 +#setenv WM_THIRD_PARTY_USE_GCC_484 1 #setenv WM_THIRD_PARTY_USE_GCC_463 1 #setenv WM_THIRD_PARTY_USE_GCC_451 1 #setenv WM_THIRD_PARTY_USE_GCC_445 1 diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE index 7e61364d2..0996482e8 100644 --- a/etc/prefs.sh-EXAMPLE +++ b/etc/prefs.sh-EXAMPLE @@ -180,6 +180,11 @@ export FOAM_VERBOSE=1 # You can override your identifier using this environment variable #export CDASH_SUBMIT_LOCAL_HOST_ID=choose_your_CDash_system_identifer +# Mac OS X MacPorts root directory. +# The default value is '/opt/local/etc/macports'. +# In order to disable the usage of MacPorts on Mac OSX, simply initialize this +# variable to a non-existing directory, or to a dummy value. +#export MACOSX_MACPORTS_ROOT="_not_using_" # ThirdParty packages: build control variables # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -187,8 +192,8 @@ export FOAM_VERBOSE=1 # installation of the corresponding ThirdParty package # # For AllMake.stage1 -#export WM_THIRD_PARTY_USE_GCC_49=1 -#export WM_THIRD_PARTY_USE_GCC_48=1 +#export WM_THIRD_PARTY_USE_GCC_492=1 +#export WM_THIRD_PARTY_USE_GCC_484=1 #export WM_THIRD_PARTY_USE_GCC_463=1 #export WM_THIRD_PARTY_USE_GCC_451=1 #export WM_THIRD_PARTY_USE_GCC_445=1 diff --git a/etc/settings.sh b/etc/settings.sh index 03f8ed405..bb3dd63ca 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -135,18 +135,22 @@ FOAM) _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.1.2/platforms/$WM_OPTIONS/etc/gmp-5.1.2.sh _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.1.2/platforms/$WM_OPTIONS/etc/mpfr-3.1.2.sh _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-1.0.1/platforms/$WM_OPTIONS/etc/mpc-1.0.1.sh - _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.6.4/platforms/$WM_OPTIONS/etc/gcc-4.6.4.csh + _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.6.4/platforms/$WM_OPTIONS/etc/gcc-4.6.4.sh ;; Gcc49) export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/packages/gcc-4.9.2/platforms/$WM_OPTIONS - _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.9.2/platforms/$WM_OPTIONS/etc/gcc-4.9.2.csh + _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.9.2/platforms/$WM_OPTIONS/etc/gcc-4.9.2.sh + ;; + Gcc48) + export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/packages/gcc-4.8.4/platforms/$WM_OPTIONS + _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.8.4/platforms/$WM_OPTIONS/etc/gcc-4.8.4.sh ;; Gcc47) export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/packages/gcc-4.7.4/platforms/$WM_OPTIONS _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.1.2/platforms/$WM_OPTIONS/etc/gmp-5.1.2.sh _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.1.2/platforms/$WM_OPTIONS/etc/mpfr-3.1.2.sh _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-1.0.1/platforms/$WM_OPTIONS/etc/mpc-1.0.1.sh - _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.7.4/platforms/$WM_OPTIONS/etc/gcc-4.7.4.csh + _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.7.4/platforms/$WM_OPTIONS/etc/gcc-4.7.4.sh ;; Gcc45) export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/packages/gcc-4.5.1/platforms/$WM_OPTIONS diff --git a/wmake/rules/darwinIntel64Gcc48 b/wmake/rules/darwinIntel64Gcc48 new file mode 120000 index 000000000..682d3c4ee --- /dev/null +++ b/wmake/rules/darwinIntel64Gcc48 @@ -0,0 +1 @@ +/Users/beaudoin/Projets/SAMH/foam//foam-extend-3.1/wmake/rules/darwinIntel64Gcc \ No newline at end of file