ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/graphviz.spec
(Generate patch)

Comparing COMP/CMSDIST/graphviz.spec (file contents):
Revision 1.19 by eulisse, Tue Jan 22 17:27:05 2008 UTC vs.
Revision 1.22 by elmer, Wed Jan 23 21:56:09 2008 UTC

# Line 11 | Line 11 | LIB64_SUFFIX=
11   case %cmsplatf in
12      *_ia32_* )
13          export LD_LIBRARY_PATH=`echo $LD_LIBRARY_PATH | sed -e 's|lib64|lib|g'`
14 <        ADDITIONAL_OPTIONS=--without-freetype
14 >        ADDITIONAL_OPTIONS="--with-freetype2=no --disable-shared --enable-static --disable-libtdl"
15      ;;
16      *_amd64_* )
17          LIB64_SUFFIX=64
18 <        ADDITIONAL_OPTIONS=--without-freetype
18 >        ADDITIONAL_OPTIONS="--with-freetype2=no --disable-shared --enable-static --disable-ltdl"
19      ;;
20      osx* )
21 <        ADDITIONAL_OPTIONS=
21 >        ADDITIONAL_OPTIONS="--with-freetype2=no"
22      ;;
23   esac
24   ./configure \
25    --with-expatlibdir=$EXPAT_ROOT/lib$LIB64_SUFFIX \
26    --with-expatincludedir=$EXPAT_ROOT/include \
27    --with-zincludedir=$ZLIB_ROOT/include \
28 <  --with-zlibdir=$ZLIB_ROOT/lib$LIB64_SUFFIX \
28 >  --with-zlibdir=$ZLIB_ROOT/lib \
29    --with-pngincludedir=$LIBJPG_ROOT/include \
30 <  --with-pnglibdir=$LIBJPG_ROOT/lib$LIB64_SUFFIX \
30 >  --with-pnglibdir=$LIBJPG_ROOT/lib \
31    --with-jpegincludedir=$LIBPNG_ROOT/include \
32 <  --with-jpeglibdir=$LIBPNG_ROOT/lib$LIB64_SUFFIX \
32 >  --with-jpeglibdir=$LIBPNG_ROOT/lib \
33    --without-x \
34    --without-tclsh \
35    --without-tcl \
# Line 41 | Line 41 | esac
41    --disable-ruby \
42    --disable-perl \
43    --without-pangocairo \
44 –  --without-freetype \
44    --without-fontconfig \
45    --without-gdk-pixbuf \
46    --disable-sharp \
# Line 63 | Line 62 | perl -p -i -e "s|\+0 \-1|-k1,1|g" dotnea
62   fi
63   # Probably the configure should just be remade on Darwin, but it builds
64   # as-is with this small cleanup
66 – %ifos darwin
65   perl -p -i -e "s|-lexpat||g" configure
66 < %endif
69 < make
66 > make %makeprocesses
67  
68   %install
69   make install
70 + # To match configure options above
71 + case %cmsplatf in
72 +    *_ia32_* | *_amd64_*)
73 +        ln -s dot_static %i/bin/dot
74 +    ;;
75 + esac
76 +
77   # SCRAM ToolBox toolfile
78   mkdir -p %i/etc/scram.d
79   cat << \EOF_TOOLFILE >%i/etc/scram.d/%n

Diff Legend

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