@@ -257,12 +257,12 @@ find . -type f -name "${file}" -exec cp '{}' third_party/pcsc-lite/client-side/ ';' done ## Create Makefile cat << \_EOF_ > third_party/pcsc-lite/client-side/Makefile || exit 1 -CFLAGS += -Wall -std=gnu++11 -CXXFLAGS += -Wall -std=gnu++11 +CFLAGS += -Wall -std=gnu++11 -g3 -ggdb3 +CXXFLAGS += -Wall -std=gnu++11 -g3 -ggdb3 CPPFLAGS += -I../src/src/PCSC OBJS = pcsc_nacl.o pcsc_nacl_global.o scard_structs_serialization.o pp_var_utils.o logging.o dom_requests_manager.o pcsc_nacl_init.o all: libpcsc.a @@ -322,13 +322,15 @@ if (clientId == NULL) { clientId = "UNKNOWN"; } - drmDelegateImpl = new DomRequestsManager::PpDelegateImpl(instance, core); - - pcscNaClDRM = new DomRequestsManager("pcsc-nacl", drmDelegateImpl); + if (pcscNaClDRM == NULL) { + drmDelegateImpl = new DomRequestsManager::PpDelegateImpl(instance, core); + + pcscNaClDRM = new DomRequestsManager("pcsc-nacl", drmDelegateImpl); + } pcsc_nacl = new PcscNacl(pcscNaClDRM, smartcardManagerAppId, clientId); if (!pcsc_nacl->Initialize()) { return; @@ -369,11 +371,11 @@ ( cd ../.. || exit 1 make distclean - ./configure --host=nacl --with-pcsc-headers="${instdir}/include/PCSC" --with-pcsc-libs="-lpcsc" cackey_cv_pcsc_works=okay --disable-dod-certs || exit 1 + ./configure --host=nacl --with-pcsc-headers="${instdir}/include/PCSC" --with-pcsc-libs="-lpcsc" cackey_cv_pcsc_works=okay --disable-dod-certs CFLAGS='-g3 -ggdb3 -Wall' || exit 1 make || exit 1 ) || return 1 mkdir -p "${instdir}/lib" cp ../../libcackey.a ../../libcackey_g.a "${instdir}/lib" || return 1