From 6706d75a74910be7764698ff858ce21f9f6181e5 Mon Sep 17 00:00:00 2001
From: John Romein <romein@astron.nl>
Date: Fri, 17 Apr 2009 14:23:38 +0000
Subject: [PATCH] bug 225: Fixed libboost_regex link issues.

---
 autoconf_share/variants.bgfen | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/autoconf_share/variants.bgfen b/autoconf_share/variants.bgfen
index d7b2acf0d81..386d6a7a747 100644
--- a/autoconf_share/variants.bgfen
+++ b/autoconf_share/variants.bgfen
@@ -1,23 +1,13 @@
 gnu.compiler.conf:   CC=/usr/bin/gcc CXX=/usr/bin/g++ CCAS=/usr/bin/gcc
-#gnu.compiler.conf:   CC=/usr/bin/gcc CXX=/usr/bin/g++ CCAS=/bgsys/drivers/ppcfloor/gnu-linux/bin/powerpc-bgp-linux-gcc --disable-lib64
-#gnubgp.compiler.conf:   CC=/bgsys/drivers/ppcfloor/gnu-linux/bin/powerpc-bgp-linux-gcc CXX=/bgsys/drivers/ppcfloor/gnu-linux/bin/powerpc-bgp-linux-g++ CCAS=/bgsys/drivers/ppcfloor/gnu-linux/bin/powerpc-bgp-linux-gcc CCASFLAGS='-DHAVE_BGP' --disable-lib64
-#gnubgp.compiler.conf:   CC=/bgsys/drivers/ppcfloor/gnu-linux/bin/powerpc-bgp-linux-gcc CXX=/bgsys/drivers/ppcfloor/gnu-linux/bin/powerpc-bgp-linux-gcc CCAS=/bgsys/drivers/ppcfloor/gnu-linux/bin/powerpc-bgp-linux-gcc CCASFLAGS='-DHAVE_BGP' --disable-lib64
 gnubgp.compiler.conf:   CC=/usr/bin/gcc CXX=/usr/bin/g++ CCAS=/bgsys/drivers/ppcfloor/gnu-linux/bin/powerpc-bgp-linux-gcc CCASFLAGS='-DHAVE_BGP' --disable-lib64
 
 gnu.compiler.aipspp.var: --with-casacore=/cephome/romein/packages/casacore-0.3.0/stage --without-wcs
 
-#bgp.variant.conf:       $(lofar_root) $(debugopt) $(nothreads) $(noshmem) $(bgp_cpp) $(bgp_ldd) --enable-backtrace --without-log4cplus --with-bglmpich='/bgsys/drivers/ppcfloor/comm' --with-fftw2='/cephome/romein/packages/fftw-2.1.5-single-precision' --with-cppflags='-DHAVE_BGP -I/bgsys/drivers/ppcfloor/comm/include -I/bgsys/drivers/ppcfloor/arch/include'
-cn.variant.conf:        $(lofar_root) $(debugopt) $(nothreads) $(noshmem) $(cn_cpp) $(cn_ldd) --enable-backtrace --without-log4cplus --without-readline --with-bglmpich='/bgsys/drivers/ppcfloor/comm' --with-fftw2='/cephome/romein/packages/fftw-2.1.5-single-precision' 
+cn.variant.conf:        $(lofar_root) $(debugopt) $(nothreads) $(noshmem) $(cn_cpp) $(cn_ldd) --enable-backtrace --without-applcommon --without-log4cplus --without-readline --with-bglmpich='/bgsys/drivers/ppcfloor/comm' --with-fftw2='/cephome/romein/packages/fftw-2.1.5-single-precision' 
 ion.variant.conf:       $(lofar_root) $(debugopt) $(threads) $(noshmem) $(ion_cpp) $(ion_ldd) --enable-backtrace --without-log4cplus --without-readline --with-casacore=/cephome/romein/packages/casacore-0.3.0/stage --without-wcs
 
-#bgp_cpp.var:            --with-cppflags='-DHAVE_BGP'
-#bgp_ldd.var:            --with-ldflags='-L/bgsys/drivers/ppcfloor/comm/lib -L/bgsys/drivers/ppcfloor/runtime/SPI' --with-libs='-lcxxmpich.cnk -lmpich.cnk -ldcmfcoll.cnk -ldcmf.cnk -lpthread -lrt -lSPI.cna -lm'
-
-#cn_cpp.var:             --with-cppflags='-DHAVE_BGP -I/bgsys/drivers/ppcfloor/comm/include -I/bgsys/drivers/ppcfloor/arch/include -I/usr/include'
 cn_cpp.var:             --with-cppflags='-B/bgsys/drivers/ppcfloor/gnu-linux/powerpc-bgp-linux/bin -DHAVE_BGP -DHAVE_BGP_CN -I/bgsys/drivers/ppcfloor/comm/include -I/bgsys/drivers/ppcfloor/arch/include'
-#cn_ldd.var:             --with-ldflags='-L/bgsys/drivers/ppcfloor/comm/lib -L/bgsys/drivers/ppcfloor/runtime/SPI -L/bgsys/drivers/ppcfloor/gnu-linux/powerpc-bgp-linux/lib -L/usr/lib' --with-libs='-lcxxmpich.cnk -lmpich.cnk -ldcmfcoll.cnk -ldcmf.cnk -lpthread -lrt -lSPI.cna -lm'
-#cn_ldd.var:             --with-ldflags='-static -L/bgsys/drivers/ppcfloor/comm/lib -L/bgsys/drivers/ppcfloor/runtime/SPI -L/usr/lib' --with-libs='-lcxxmpich.cnk /bgsys/drivers/ppcfloor/gnu-linux/powerpc-bgp-linux/lib/libstdc++.a -lmpich.cnk -ldcmfcoll.cnk -ldcmf.cnk -lpthread -lrt -lSPI.cna -lm'
-cn_ldd.var:             --with-ldflags='-B/bgsys/drivers/ppcfloor/gnu-linux/powerpc-bgp-linux/bin -L/bgsys/drivers/ppcfloor/comm/lib -L/bgsys/drivers/ppcfloor/runtime/SPI' --with-libs='-lcxxmpich.cnk -lmpich.cnk -ldcmfcoll.cnk -ldcmf.cnk -lpthread -lrt -lSPI.cna -lm'
+cn_ldd.var:             --with-ldflags='-B/bgsys/drivers/ppcfloor/gnu-linux/powerpc-bgp-linux/bin -L/bgsys/drivers/ppcfloor/comm/lib -L/bgsys/drivers/ppcfloor/runtime/SPI -L/cephome/romein/lib.bgp -Wl,-rpath -Wl,/cephome/romein/lib.bgp' --with-libs='-lcxxmpich.cnk -lmpich.cnk -ldcmfcoll.cnk -ldcmf.cnk -lpthread -lrt -lSPI.cna -lm'
 
 ion_cpp.var:             --with-cppflags='-B/bgsys/drivers/ppcfloor/gnu-linux/powerpc-bgp-linux/bin -DHAVE_BGP -DHAVE_BGP_ION -I/bgsys/drivers/ppcfloor/comm/include -I/bgsys/drivers/ppcfloor/arch/include'
-ion_ldd.var:            --with-ldflags='-B/bgsys/drivers/ppcfloor/gnu-linux/powerpc-bgp-linux/bin'
+ion_ldd.var:             --with-ldflags='-L/cephome/romein/lib.bgp -Wl,-rpath -Wl,/cephome/romein/lib.bgp'
-- 
GitLab