ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CMSDIST/llvm-gcc-toolfile.spec

Comparing COMP/CMSDIST/llvm-gcc-toolfile.spec (file contents):
Revision 1.1 by eulisse, Thu Jan 20 10:13:33 2011 UTC vs.
Revision 1.3 by eulisse, Tue Jan 25 13:04:30 2011 UTC

#	Line 42 | Line 42 | export COMPILER_VERSION=`echo $LLVM_VERS
42		export COMPILER_VERSION_MAJOR=`echo $LLVM_VERSION | sed -e 's|\([0-9]\).*|\1|'`
43		export COMPILER_VERSION_MINOR=`echo $LLVM_VERSION | sed -e 's|[0-9].\([0-9]\).*|\1|'`
44
45	+	export GCC_ARCH=$(basename $(dirname `find $GCC_ROOT/include -mindepth 4 -maxdepth 4 -name bits`))
46	+
47		# Generic template for the toolfiles.
48		# *** USE @VARIABLE@ plus associated environment variable to customize. ***
49		# DO NOT DUPLICATE the toolfile template.
#	Line 61 | Line 63 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cxx
63		<flags CPPDEFINES="_GNU_SOURCE"/>
64		<flags CXXSHAREDOBJECTFLAGS="-fPIC"/>
65		<flags CPPFLAGS="-I@GCC_ROOT@/include/c++/@GCC_REALVERSION@"/>
66	<	<flags CPPFLAGS="-I@GCC_ROOT@/include/c++/@GCC_REALVERSION@/i686-pc-linux-gnu"/>
66	>	<flags CPPFLAGS="-I@GCC_ROOT@/include/c++/@GCC_REALVERSION@/@GCC_ARCH@"/>
67		<flags CPPFLAGS="-I@GCC_ROOT@/include/c++/@GCC_REALVERSION@/backward"/>
68		<flags CXXFLAGS="-O2 -pedantic -ansi -pthread -pipe"/>
69		<flags CXXFLAGS="@ARCH_CXXFLAGS@ @COMPILER_CXXFLAGS@"/>
#	Line 72 | Line 74 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cxx
74		<flags SHAREDSUFFIX="@OS_SHAREDSUFFIX@"/>
75		<flags LD_UNIT="@OS_LD_UNIT@ @ARCH_LD_UNIT@"/>
76		<flags SCRAM_LANGUAGE_TYPE="C++"/>
75	–	<runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$CXXCOMPILER_BASE/@ARCH_LIB64DIR@" type="path"/>
77		<runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$CXXCOMPILER_BASE/lib" type="path"/>
78		<runtime name="PATH" value="$CXXCOMPILER_BASE/bin" type="path"/>
79		<runtime name="@OS_RUNTIME_LDPATH_NAME@" value="@GCC_ROOT@/@ARCH_LIB64DIR@" type="path"/>
#	Line 223 | Line 224 | esac
224		perl -p -i -e 's|\@([^@]*)\@|$ENV{$1}|g' %i/etc/scram.d/*.xml
225
226		%post
227	<	[ "X$RPM_INSTALL_PREFIX" == "X$CMS_INSTALL_PREFIX" ] || perl -p -i -e "s|$RPM_INSTALL_PREFIX|$CMS_INSTALL_PREFIX|g" $RPM_INSTALL_PREFIX/%{pkgrel}/etc/scram.d/*.xml
227	>	%{relocateConfig}etc/scram.d/*.xml
228		echo "LLVM_GCC_TOOLFILE_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'; export GCC_TOOLFILE_ROOT" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
229		echo "setenv LLVM_GCC_TOOLFILE_ROOT '$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines