Changes needed to p20.16.08 to build LTS4 (SLF4) exes rather than RH7.1 exes M D0reldb/D0-glpkgs M D0reldb/redhat-release M D0reltools/buildrel.sh M SRT_D0/SoftRelTools/combined_arch_spec.txt M SRT_D0/SoftRelTools/combined_compilers.txt M SRT_D0/SoftRelTools/compilers/GCC.mk M SRT_D0/special/post_d0om_linkage.mk M ctbuild/src/ctest_rules.mk Index: D0reldb/D0-glpkgs =================================================================== RCS file: /cvsroot/d0cvs/D0reldb/D0-glpkgs,v retrieving revision 1.1.4.224.2.17 diff -u -r1.1.4.224.2.17 D0-glpkgs --- D0reldb/D0-glpkgs 18 Aug 2009 18:16:10 -0000 1.1.4.224.2.17 +++ D0reldb/D0-glpkgs 21 Jul 2010 19:47:49 -0000 @@ -1,17 +1,19 @@ #Misc, compilers tools whod0 -gcc v3_4_3_dzero +gcc v3_4_3_glibc_232_dzero ld v2_15_dzero -linktime v1_2 -q +gcc342:+glibc_2_2_4 -runtime v1_1 -q +glibc_2_2_4 -python v2_2_2_eh -q +gcc342 +linktime v3_0 -q lts4 +runtime v3_0 -q lts4 +python v2_2_2 -q lts3 perl v5_6_1_eh -q +gcc342 -swig v1_1_p5_eh -q +gcc342 + +#Online +swig v1_5_1_glibc_232_dzero -q +gcc343 gtools v2_4c #Code libraries cern 2000_eh -q +gcc342 -lhapdf v5_2_2 -j +lhapdf v5_2_2 -q +lts3_32 -j procor v1_4 jetnet v3_4 zlib v1_2_3 @@ -28,9 +30,9 @@ d0gstar_AltGeom v00-00-01 #Online tools and libraries -ace v5_4_2 -q +RH71-GCC_3_4 +ace v5_4_2_glibc_232_dzero -q +gcc343 pyxml v0_8_2b -j -xerces v1_5_1_eh -q +gcc342 +xerces v1_5_1_glibc_232_dzero -q +gcc343 l3xsbc_distrib v1_0_ups #MonteCarlo @@ -50,14 +52,14 @@ omniORB v3_0_4 -q +GCC-3.1-PYTHON-2.1 fnorb v1_1b_6 -j d0_config -sam_cpp_api v7_4_3 -q +GCC-3.4.3 +sam_cpp_api v7_4_3_sl3_ob -q +GCC-3.4.3 #Visualization -histo v5-0-3a1 +histo v5_0_5c imagelibs v1_0 qt v3.3.3 -q +gcc3_4_3_dzero:+rh7_1 coin v2.3.0 -q +gcc3_4_3_dzero:+rh7_1 iguana v4.2.4f5 -q +gcc3_4_3_dzero:+rh7_1 pmw v1_1a -mesa v6.0.1 -q +gcc3_4_3_dzero:+rh7_1 -freetype v2.1.9 -q +gcc3_4_3_dzero:+rh7_1 +#mesa v6.0.1 -q +gcc3_4_3_dzero:+rh7_1 +#freetype v2.1.9 -q +gcc3_4_3_dzero:+rh7_1 Index: D0reldb/redhat-release =================================================================== RCS file: /cvsroot/d0cvs/D0reldb/redhat-release,v retrieving revision 1.1.4.1 diff -u -r1.1.4.1 redhat-release --- D0reldb/redhat-release 6 Nov 2007 20:27:18 -0000 1.1.4.1 +++ D0reldb/redhat-release 13 Jul 2010 14:50:34 -0000 @@ -1 +1 @@ -Fermi Linux Release 7.1.2 (Top) +Scientific Linux Fermi LTS release 4.2 (Wilson) Index: SRT_D0/SoftRelTools/combined_arch_spec.txt =================================================================== RCS file: /cvsroot/d0cvs/SRT_D0/SoftRelTools/combined_arch_spec.txt,v retrieving revision 1.51.2.3 retrieving revision 1.51.2.3.4.1 diff -u -r1.51.2.3 -r1.51.2.3.4.1 --- SRT_D0/SoftRelTools/combined_arch_spec.txt 3 Apr 2007 18:47:32 -0000 1.51.2.3 +++ SRT_D0/SoftRelTools/combined_arch_spec.txt 21 Jul 2010 19:19:48 -0000 1.51.2.3.4.1 @@ -156,10 +156,10 @@ cern IRIX ldflags -L$(CERN_DIR)/lib cern IRIX loadlibes -lpacklib -lpawlib -lgraflib -lgrafX11 -lmathlib -lpacklib -lmathlib -cern Linux2.2 ldflags -L$(CERN_DIR)/lib -L$(RUNTIME_DIR)/usr/X11R6/lib +cern Linux2.2 ldflags -L$(CERN_DIR)/lib cern Linux2.2 loadlibes -lpacklib -lpawlib -lgraflib -lgrafX11 -lmathlib -lpacklib -lmathlib -lcernstubs -lcrypt -lnsl -lUil -lMrm -lXm -lXmu -lXt -lXi -lSM -lXext -lICE -lXp -lX11 -cern Linux2.4 ldflags -L$(CERN_DIR)/lib -L$(RUNTIME_DIR)/usr/X11R6/lib +cern Linux2.4 ldflags -L$(CERN_DIR)/lib cern Linux2.4 loadlibes -lpacklib -lpawlib -lgraflib -lgrafX11 -lmathlib -lpacklib -lmathlib -lcernstubs -lcrypt -lnsl -lUil -lMrm -lXm -lXmu -lXt -lXi -lSM -lXext -lICE -lXp -lX11 # @@ -361,7 +361,6 @@ motif Linux2.2 cppflags -I$(LINKTIME_DIR)/usr/X11R6/include -motif Linux2.2 ldflags -L$(RUNTIME_DIR)/usr/X11R6/lib motif Linux2.2 loadlibes -lUil -lMrm -lXm -lXmu -lXt -lXi -lSM -lXext -lICE -lXp -lX11 Index: SRT_D0/SoftRelTools/combined_compilers.txt =================================================================== RCS file: /cvsroot/d0cvs/SRT_D0/SoftRelTools/combined_compilers.txt,v retrieving revision 1.25 retrieving revision 1.25.12.1 diff -u -r1.25 -r1.25.12.1 --- SRT_D0/SoftRelTools/combined_compilers.txt 18 Jul 2005 17:10:16 -0000 1.25 +++ SRT_D0/SoftRelTools/combined_compilers.txt 21 Jul 2010 19:19:48 -0000 1.25.12.1 @@ -100,15 +100,15 @@ Linux2.4 gcc all fcflags -UD0 -march=pentium3 -fexceptions -fPIC -fno-strict-aliasing -fmessage-length=0 -fdollar-ok -fno-automatic -fno-second-underscore -ffixed-line-length-132 -fno-globals -O0 -g Linux2.4 gcc maxopt fcflags -UD0 -march=pentium3 -fexceptions -fPIC -fno-strict-aliasing -fmessage-length=0 -fdollar-ok -fno-automatic -fno-second-underscore -ffixed-line-length-132 -fno-globals -O3 -Linux2.4 gcc all ldflags -pthread -B$(LINKTIME_DIR)/usr/X11R6/lib -B$(RUNTIME_DIR)/usr/lib -B$(LINKTIME_DIR)/lib -B$(LINKTIME_DIR)/usr/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/X11R6/lib -Wl,-rpath-link -Wl,$(RUNTIME_DIR)/usr/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/lib +Linux2.4 gcc all ldflags -pthread -B$(LINKTIME_DIR)/usr/X11R6/lib -B$(LINKTIME_DIR)/lib -B$(LINKTIME_DIR)/usr/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/X11R6/lib -Wl,-rpath-link -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/lib Linux2.4 gcc all arflags crs Linux2.4 gcc maxopt arflags crs Linux2.4 gcc all aroflag -Linux2.4 gcc all sharedarflags -shared -pthread -march=pentium3 -pipe -fuse-cxa-atexit -fexceptions -fPIC -fno-strict-aliasing -fmessage-length=0 -ffor-scope -ftemplate-depth-50 -O0 -g -B$(LINKTIME_DIR)/usr/X11R6/lib -B$(RUNTIME_DIR)/usr/lib -B$(LINKTIME_DIR)/lib -B$(LINKTIME_DIR)/usr/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/X11R6/lib -Wl,-rpath-link -Wl,$(RUNTIME_DIR)/usr/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/lib -Linux2.4 gcc maxopt sharedarflags -shared -march=pentium3 -pipe -fuse-cxa-atexit -fexceptions -fPIC -fno-strict-aliasing -fmessage-length=0 -ffor-scope -ftemplate-depth-50 -O3 -g -B$(LINKTIME_DIR)/usr/X11R6/lib -B$(RUNTIME_DIR)/usr/lib -B$(LINKTIME_DIR)/lib -B$(LINKTIME_DIR)/usr/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/X11R6/lib -Wl,-rpath-link -Wl,$(RUNTIME_DIR)/usr/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/lib +Linux2.4 gcc all sharedarflags -shared -pthread -march=pentium3 -pipe -fuse-cxa-atexit -fexceptions -fPIC -fno-strict-aliasing -fmessage-length=0 -ffor-scope -ftemplate-depth-50 -O0 -g -B$(LINKTIME_DIR)/usr/X11R6/lib -B$(LINKTIME_DIR)/lib -B$(LINKTIME_DIR)/usr/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/X11R6/lib -Wl,-rpath-link -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/lib +Linux2.4 gcc maxopt sharedarflags -shared -march=pentium3 -pipe -fuse-cxa-atexit -fexceptions -fPIC -fno-strict-aliasing -fmessage-length=0 -ffor-scope -ftemplate-depth-50 -O3 -g -B$(LINKTIME_DIR)/usr/X11R6/lib -B$(LINKTIME_DIR)/lib -B$(LINKTIME_DIR)/usr/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/X11R6/lib -Wl,-rpath-link -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/lib -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/lib Linux2.4 gcc all sharedaroflag -o cvs diff: Diffing SRT_D0/SoftRelTools/compilers Index: SRT_D0/SoftRelTools/compilers/GCC.mk =================================================================== RCS file: /cvsroot/d0cvs/SRT_D0/SoftRelTools/compilers/GCC.mk,v retrieving revision 1.35 retrieving revision 1.35.12.1 diff -u -r1.35 -r1.35.12.1 --- SRT_D0/SoftRelTools/compilers/GCC.mk 18 Jul 2005 17:10:16 -0000 1.35 +++ SRT_D0/SoftRelTools/compilers/GCC.mk 21 Jul 2010 19:19:48 -0000 1.35.12.1 @@ -73,7 +73,6 @@ # compatibility environment ifneq (,$(strip $(LINKTIME_DIR))) -ifneq (,$(strip $(RUNTIME_DIR))) override CPPFLAGS += \ -I$(LINKTIME_DIR)/usr/X11R6/include \ @@ -81,11 +80,9 @@ override LDFLAGS += \ -B$(LINKTIME_DIR)/usr/X11R6/lib \ --B$(RUNTIME_DIR)/usr/lib \ -B$(LINKTIME_DIR)/lib \ -B$(LINKTIME_DIR)/usr/lib \ -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/X11R6/lib \ --Wl,-rpath-link -Wl,$(RUNTIME_DIR)/usr/lib \ -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/lib \ -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/lib #-Wl,-t @@ -94,18 +91,15 @@ override SHAREDARFLAGS += \ -B$(LINKTIME_DIR)/usr/X11R6/lib \ --B$(RUNTIME_DIR)/usr/lib \ -B$(LINKTIME_DIR)/lib \ -B$(LINKTIME_DIR)/usr/lib \ -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/X11R6/lib \ --Wl,-rpath-link -Wl,$(RUNTIME_DIR)/usr/lib \ -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/lib \ -Wl,-rpath-link -Wl,$(LINKTIME_DIR)/usr/lib #-Wl,-t #-Wl,-v endif -endif endif # Linux cvs diff: Diffing SRT_D0/SoftRelTools/platforms cvs diff: Diffing SRT_D0/special Index: SRT_D0/special/post_d0om_linkage.mk =================================================================== RCS file: /cvsroot/d0cvs/SRT_D0/special/post_d0om_linkage.mk,v retrieving revision 1.15 retrieving revision 1.15.42.1 diff -u -r1.15 -r1.15.42.1 --- SRT_D0/special/post_d0om_linkage.mk 28 Jan 2002 23:24:35 -0000 1.15 +++ SRT_D0/special/post_d0om_linkage.mk 21 Jul 2010 19:19:48 -0000 1.15.42.1 @@ -57,7 +57,7 @@ | head -1 \ | sed -e 's:.$$::'` ; \ cat $${depfile} \ - | tail +2 \ + | tail -n +2 \ | sed -e 's:\\$$::' \ -e "s|^|$${prefix}|" \ > $${depfile}.tmp ; \ cvs diff: Diffing SRT_D0/special/scripts Index: ctbuild/src/ctest_rules.mk =================================================================== RCS file: /cvsroot/d0cvs/ctbuild/src/ctest_rules.mk,v retrieving revision 1.117 diff -u -r1.117 ctest_rules.mk --- ctbuild/src/ctest_rules.mk 13 Jul 2005 17:49:26 -0000 1.117 +++ ctbuild/src/ctest_rules.mk 13 Jul 2010 14:50:34 -0000 @@ -436,7 +436,7 @@ | head -1 \ | sed -e 's:.$$::'` ; \ cat $${depfile} \ - | tail +2 \ + | tail -n +2 \ | sed -e 's:\\$$::' \ -e "s|^|$${prefix}|" \ > $${depfile}.tmp ; \