From 116b64ee988e86787a0b4fc8466ec5300e0ad736 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Thu, 27 Sep 2007 07:57:56 +0000 Subject: [PATCH] Update for Mandriva2007 --- config_files/CAS-6.2sp2.sh | 18 ++++++++++++++++-- config_files/med-2.2.3.sh | 11 +++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/config_files/CAS-6.2sp2.sh b/config_files/CAS-6.2sp2.sh index 9f03c2f..f5d9d63 100755 --- a/config_files/CAS-6.2sp2.sh +++ b/config_files/CAS-6.2sp2.sh @@ -98,11 +98,25 @@ check_jb tar xfz ${SOURCE_DIR}/CAS-6.2sp2.tar.gz -C ${INSTALL_WORK} cd ${PRODUCT_WORK} # configure + +is_mandriva2007=0 + +if [ -e /etc/issue ] ; then + grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_mandriva2007=1 ; fi +fi + +if [ $is_mandriva2007 == 1 ] ; then +where_xmu_include=/usr/include/X11 +else +where_xmu_include=/usr/X11R6/include/X11 +fi + if test `uname -m` = "x86_64" ; then - flags="$flags --with-xmu-include=/usr/X11R6/include/X11" + flags="$flags --with-xmu-include=$where_xmu_include" flags="$flags --with-xmu-library=/usr/X11R6/lib64" else - flags="$flags --with-xmu-include=/usr/X11R6/include/X11" + flags="$flags --with-xmu-include=$where_xmu_include" flags="$flags --with-xmu-library=/usr/X11R6/lib" fi flags="$flags LDFLAGS=-lpthread" diff --git a/config_files/med-2.2.3.sh b/config_files/med-2.2.3.sh index b642fdf..8cb64b2 100755 --- a/config_files/med-2.2.3.sh +++ b/config_files/med-2.2.3.sh @@ -78,14 +78,21 @@ makedir ${PRODUCT_DIR} #vsr: provide additional flags for f95 (Mandriva 2006.0, Fedora Core 4) is_mandriva=0 is_fedora=0 +is_mandriva2007=0 if [ -e /etc/redhat-release ] ; then grep -e "Mandriva Linux release 2006.0" /etc/redhat-release > /dev/null if [ $? == 0 ] ; then is_mandriva=1 ; fi + grep -e "Mandriva Linux release 2007.0" /etc/redhat-release > /dev/null + if [ $? == 0 ] ; then is_mandriva2007=1 ; fi grep -e "Fedora Core release 4" /etc/redhat-release > /dev/null if [ $? == 0 ] ; then is_fedora=1 ; fi fi - -if [ $is_mandriva == 1 ] || [ $is_fedora == 1 ] ; then +if [ $is_mandriva2007 == 1 ] ; then +chmod +w ./Makefile.am +mv Makefile.am Makefile.am.orig +sed -e 's/ include src tests tools doc / include src tools doc /g' Makefile.am.orig > Makefile.am +fi +if [ $is_mandriva == 1 ] || [ $is_mandriva2007 == 1 ] || [ $is_fedora == 1 ] ; then if test `uname -m` = "x86_64" ; then echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG" ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog -- 2.39.2