Modified packages/build from [e94c49a608] to [9250a4fcfd].

    34     34   }
    35     35   
    36     36   function postconfigure() {
    37     37   	:
    38     38   }
    39     39   
    40     40   function configure() {
    41         -	dynlinker=/opt/appfs/
    42         -DYNLINKER=/uri/0install/sw.oc9.org/`readlink /uri/0install/sw.oc9.org/lib/ld-linux.so.2 | sed s@^\.\./@@`
    43         -LDFLAGS="-march=i486 ${ZEXTRALIB} -L/uri/0install/sw.oc9.org/lib -Wl,--rpath -Wl,/uri/0install/sw.oc9.org/lib -Wl,--dynamic-linker -Wl,${DYNLINKER}"
    44         -CXXINCLUDES=/uri/0install/sw.oc9.org/include/c++/`ls -1 /uri/0install/sw.oc9.org/include/c++ | sed  's@.*@&. |&@;s@\(|.*\)\(\.\)@\1,@g;s@^@.@;s@\.@..@g;s@\.\([0-9]\)\.@.00\1\.@g;s@\.\([0-9][0-9]\)\.@.0\1.@g;s
    45         -@\.\.@.@g;s@^\.@@;s@\.$@@' | sort | tail -1 | cut -f 2- -d '|' | sed s@,@.@g`
           41  +	glibcvers=2.20
           42  +	glibcdir="/opt/appfs/core.appfs.rkeene.org/glibc/platform/${glibcvers}"
           43  +	dynlinker="$(ls "${glibcdir}"/lib/ld-linux*.so.* | tail -n 1)"
    46     44   
    47         -echo "CFLAGS='-march=i486 ${ZEXTRAINC} -I/uri/0install/sw.oc9.org/include'"
    48         -echo "CXXFLAGS='-march=i486 ${ZEXTRAINC} -I${CXXINCLUDES} -I${CXXINCLUDES}/i486-pc-linux-gnu'"
    49         -echo "CPPFLAGS='${ZEXTRAINC} -I/uri/0install/sw.oc9.org/include -I${CXXINCLUDES} -I${CXXINCLUDES}/i486-pc-linux-gnu'"
    50         -echo "LDFLAGS='${LDFLAGS}'"
    51         -echo "CC='gcc'"
    52         -echo "PATH='${ZEXTRAPATH}:/uri/0install/sw.oc9.org/bin:`fix_path ${PATH} sw.oc9.org`'" | fix_path
    53         -echo "LD_RUN_PATH='${ZBUILDPATH}:/uri/0install/sw.oc9.org/lib:`fix_path ${LD_RUN_PATH} sw.oc9.org`'" | fix_path
    54         -echo "LD_LIBRARY_PATH='/uri/0install/sw.oc9.org/lib:`fix_path ${LD_LIBRARY_PATH} sw.oc9.org`'" | fix_path
    55         -echo "PKG_CONFIG_PATH='${ZBUILDPATH}/lib/pkgconfig:/uri/0install/sw.oc9.org/lib/pkgconfig:`fix_path ${PKG_CONFIG_PATH} sw.oc9.org`'" | fix_path
    56         -echo "MANPATH='${ZBUILDPATH}/man:/uri/0install/sw.oc9.org/man:`fix_path ${MANPATH} sw.oc9.org`'" | fix_path
    57         -echo "export CFLAGS CPPFLAGS LDFLAGS PATH LD_LIBRARY_PATH LD_RUN_PATH PKG_CONFIG_PATH MANPATH CC"
           45  +	CFLAGS="-I${glibcdir}/include"
           46  +	CPPFLAGS="-I${glibcdir}/include"
           47  +	LDFLAGS="-Wl,--rpath,${glibcdir}/lib -Wl,--dynamic-linker,${dynlinker}"
           48  +	export CFLAGS CPPFLAGS LDFLAGS
    58     49   
    59     50   	./configure --prefix="${prefix}" --sysconfdir=/etc --localstatedir=/var
    60     51   }
    61     52   
    62     53   function prebuild() {
    63     54   	:
    64     55   }