Magellan Linux

Diff of /smage/trunk/core/eglibc/eglibc-2.12.0_20101019-r1.smage2

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

revision 635 by niro, Tue Oct 19 19:13:13 2010 UTC revision 636 by niro, Wed Oct 20 11:49:00 2010 UTC
# Line 311  src_prepare() Line 311  src_prepare()
311    
312  src_compile()  src_compile()
313  {  {
   
  # fixes some build issues;  
  # -> configure: error: no acceptable grep could be found  
  export ac_cv_path_GREP=/bin/grep  
   
314   # support multilib lib64 dir (x86_64 only)   # support multilib lib64 dir (x86_64 only)
315   if [[ ${ARCH} = x86_64 ]]   if [[ ${ARCH} = x86_64 ]]
316   then   then
# Line 324  src_compile() Line 319  src_compile()
319   cd ${SRCDIR}/build-m32   cd ${SRCDIR}/build-m32
320    
321   CC="gcc -m32" CXX="g++ -m32" \   CC="gcc -m32" CXX="g++ -m32" \
322     CFLAGS="${CFLAGS//-march=${ARCH}} -march=i686" \
323     CXXFLAGS="${CXXFLAGS//-march=${ARCH}} -march=i686" \
324   ../configure \   ../configure \
325   --build=${CHOST} \   --build=${CHOST} \
326   --host=i686-pc-linux-gnu \   --host=i686-pc-linux-gnu \
# Line 331  src_compile() Line 328  src_compile()
328   --mandir=/usr/share/man \   --mandir=/usr/share/man \
329   --infodir=/usr/share/info \   --infodir=/usr/share/info \
330   --disable-profile \   --disable-profile \
331   --enable-add-ons=nptl \   --enable-add-ons=nptl,libidn \
332   --with-tls \   --with-tls \
333   --with-__thread \   --with-__thread \
334   --enable-kernel=${ENABLE_KERNEL} \   --enable-kernel=${ENABLE_KERNEL} \
# Line 341  src_compile() Line 338  src_compile()
338   --libexecdir=/usr/lib/eglibc \   --libexecdir=/usr/lib/eglibc \
339   --with-headers=${ALT_HEADERS} \   --with-headers=${ALT_HEADERS} \
340   --disable-nls \   --disable-nls \
341     --enable-bind-now \
342   || die   || die
343    
344   make PARALLELMFLAGS="${MAKEOPTS}" || die   make PARALLELMFLAGS="${MAKEOPTS}" || die
# Line 361  src_compile() Line 359  src_compile()
359   --mandir=/usr/share/man \   --mandir=/usr/share/man \
360   --infodir=/usr/share/info \   --infodir=/usr/share/info \
361   --disable-profile \   --disable-profile \
362   --enable-add-ons=nptl \   --enable-add-ons=nptl,libidn \
363   --with-tls \   --with-tls \
364   --with-__thread \   --with-__thread \
365   --enable-kernel=2.6.0 \   --enable-kernel=${ENABLE_KERNEL} \
366   --without-cvs \   --without-cvs \
367   --without-gd \   --without-gd \
368   --libdir=/usr/$(mlibdir) \   --libdir=/usr/$(mlibdir) \
369   --libexecdir=/usr/$(mlibdir)/eglibc \   --libexecdir=/usr/$(mlibdir)/eglibc \
370   --with-headers=${ALT_HEADERS} \   --with-headers=${ALT_HEADERS} \
371     --enable-bind-now \
372   || die   || die
373    
374   make PARALLELMFLAGS="${MAKEOPTS}" || die   make PARALLELMFLAGS="${MAKEOPTS}" || die

Legend:
Removed from v.635  
changed lines
  Added in v.636