Index: build/chrome/Makefile ================================================================== --- build/chrome/Makefile +++ build/chrome/Makefile @@ -2,11 +2,11 @@ CXX = pnacl-clang++ AR = pnacl-ar RANLIB = pnacl-ranlib FINALIZE = pnacl-finalize -CACKEY_LIBS = -Llib -lcackey +CACKEY_LIBS = -Llib -lcackey -lz PCSC_LIBS = -Llib -lpcsc -L${NACL_SDK_ROOT}/lib/pnacl/Release -lppapi -lppapi_cpp LIBS = $(CACKEY_LIBS) $(PCSC_LIBS) CFLAGS = -Wall -I${NACL_SDK_ROOT}/include CXXFLAGS = $(CFLAGS) @@ -13,11 +13,11 @@ PATH += :${NACL_SDK_ROOT}/toolchain/linux_pnacl/bin export PATH all: cackey.pexe -cackey.pexe: cackey-chrome.o cackey-chrome-init.o lib/libcackey.a lib/libpcsc.a +cackey.pexe: cackey-chrome.o cackey-chrome-init.o lib/libcackey.a lib/libpcsc.a lib/libz.a $(CXX) -o cackey.pexe.new cackey-chrome.o cackey-chrome-init.o $(LIBS) $(FINALIZE) cackey.pexe.new mv cackey.pexe.new cackey.pexe lib/libcackey.a: build-deps @@ -30,18 +30,23 @@ lib/libpcsc.a: lib/libcackey.a mkdir -p lib rm -f lib/libpcsc.a cd lib && ln -s ../workdir-*.inst/lib/libpcsc.a . +lib/libz.a: lib/libcackey.a + mkdir -p lib + rm -f lib/libz.a + cd lib && ln -s ../workdir-*.inst/lib/libz.a . + cackey-chrome.o: cackey-chrome.c cackey-chrome-init.o: cackey-chrome-init.cc clean: rm -rf workdir-* - rm -f lib/libcackey.a lib/libpcsc.a + rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a -rmdir lib rm -f cackey-chrome.o cackey-chrome-init.o rm -f cackey.pexe distclean: clean .PHONY: all clean distclean Index: build/chrome/build-deps ================================================================== --- build/chrome/build-deps +++ build/chrome/build-deps @@ -195,11 +195,13 @@ echo "using gcc : pnacl : ${CXX} ;" >> project-config.jam ./b2 --debug-configuration toolset=gcc-pnacl target-os=linux link=static runtime-link=static || exit 1 - ./bjam install || exit 1 + ./bjam install | grep -v '^common.copy ' + + exit 0 ) || return 1 rm -rf "${workdir}" return 0 @@ -304,11 +306,11 @@ ( cd ../.. || exit 1 make distclean - ./configure --host=nacl --with-pcsc-libs="-lpcsc" cackey_cv_pcsc_works=okay || exit 1 + ./configure --host=nacl --with-pcsc-headers="${instdir}/include/PCSC" --with-pcsc-libs="-lpcsc" cackey_cv_pcsc_works=okay || exit 1 make || exit 1 ) || return 1 mkdir -p "${instdir}/lib" cp ../../libcackey.a ../../libcackey_g.a "${instdir}/lib" || return 1