Magellan Linux

Diff of /trunk/extras/qt4/qt4-4.5.1-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1805 by niro, Sat Jun 6 10:58:44 2009 UTC revision 1806 by niro, Sat Jun 6 11:12:47 2009 UTC
# Line 121  src_compile() Line 121  src_compile()
121   [[ $(mlibdir) != lib ]] && myconf="-L/usr/$(mlibdir)"   [[ $(mlibdir) != lib ]] && myconf="-L/usr/$(mlibdir)"
122    
123   # enable this only for binutils >=2.18   # enable this only for binutils >=2.18
124   [[ $(ld -v | cut -d' ' -f4 | cut -d. -f1-2) > 2.17 ]] && myconf="${myconf} -reduce-relocations"   [[ $(ld -v | sed 's/.*\ \([0-9].[0-9].*\)/\1/') > 2.17 ]] && myconf="${myconf} -reduce-relocations"
125    
126   ./configure \   ./configure \
127   -prefix ${QT_PREFIX} \   -prefix ${QT_PREFIX} \
# Line 160  src_compile() Line 160  src_compile()
160   -openssl \   -openssl \
161   -system-nas-sound \   -system-nas-sound \
162   -confirm-license \   -confirm-license \
163     -opensource \
164   -no-rpath \   -no-rpath \
165   -system-sqlite \   -system-sqlite \
166   -optimized-qmake \   -optimized-qmake \
  -reduce-relocations \  
167   ${myconf} \   ${myconf} \
168   || die   || die
169    

Legend:
Removed from v.1805  
changed lines
  Added in v.1806