Check-in [ee07cc40d0]
Overview
SHA1:ee07cc40d03f6d82c896f5d3d58be185e15c2f06
Date: 2017-03-09 02:42:13
User: rkeene
Comment:Better linking to zlib for AppFS build
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2017-03-09
02:43
[21da395d74] ChromeOS Release 9 (user: rkeene, tags: trunk)
02:42
[ee07cc40d0] Better linking to zlib for AppFS build (user: rkeene, tags: trunk)
02:41
[fbed2df898] Updated to try more application IDs for CACs (user: rkeene, tags: trunk)
Changes

Modified build/appfs/build.sh from [8ef3b61bfc] to [cf79937747].

    15     15   		echo "Unknown arch"
    16     16   		exit 1
    17     17   		;;
    18     18   esac
    19     19   
    20     20   gcc_default_headers_c="$(echo '' | ${CPP:-cpp} -v 2>&1 | sed '/^End of search list/,$ d;0,/search starts here:$/ d' | grep '/gcc/' | sed 's@^ *@-isystem @' | tr $'\n' ' ')"
    21     21   glibcdir="$(readlink -f /opt/appfs/core.appfs.rkeene.org/glibc/platform/latest)"
           22  +zlibdir="$(readlink -f /opt/appfs/core.appfs.rkeene.org/zlib/platform/latest)"
    22     23   
    23     24   ./configure \
    24     25   	--with-pin-command-x='/opt/appfs/rkeene.org/cackey/platform/latest/bin/cackey-ask-pin' \
    25     26   	--with-pcsc-headers=/opt/appfs/rkeene.org/pcsc-lite/platform/latest/include/PCSC \
    26     27   	--with-pcsc-libs="-L$(readlink -f /opt/appfs/rkeene.org/pcsc-lite/platform/latest/lib) -Wl,-rpath,$(readlink -f /opt/appfs/rkeene.org/pcsc-lite/platform/latest/lib) -lpcsclite" \
    27     28   	CC="${CC:-gcc} -nostdinc ${gcc_default_headers_c} -isystem ${glibcdir}/include -isystem /opt/appfs/core.appfs.rkeene.org/linux-headers/platform/2.6.32.63/include" \
    28     29   	CPPFLAGS="-I/opt/appfs/core.appfs.rkeene.org/zlib/platform/latest/include" \
    29         -	LDFLAGS="-L${glibcdir}/lib -L$(readlink -f /opt/appfs/core.appfs.rkeene.org/zlib/platform/latest/lib) -pthread -Wl,--dynamic-linker,${glibcdir}/lib/ld-linux-${ARCH}.so.2"
           30  +	LDFLAGS="-L${glibcdir}/lib -Wl,-R,${glibcdir}/lib -L${zlibdir}/lib -Wl,-R,${zlibdir}/lib -pthread -Wl,--dynamic-linker,${glibcdir}/lib/ld-linux-${ARCH}.so.2"
    30     31   
    31     32   make