From 576ecf52260b43ebc7d76dd252d9aab8f99fe9e7 Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Sat, 5 Nov 2011 14:31:47 +0000 Subject: [PATCH] workaround to undefined reference to rpl_malloc. cross compiling works now git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@624 96b47cad-a561-4643-ad3b-153ac7d7599c --- npa/Makefile.am | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/npa/Makefile.am b/npa/Makefile.am index eaea87d..3d07cc1 100644 --- a/npa/Makefile.am +++ b/npa/Makefile.am @@ -32,15 +32,15 @@ restore_la = find "$(srcdir)/src/opensc/win32/build/image" -name '*.la' | while mv "$${f}.tmp" "$${f}"; \ done -win-opensc: +src/opensc/win32/build/image/opensc/lib/libopensc.la: cd $(top_srcdir)/src/opensc && \ ./bootstrap && \ ./configure --disable-doc && \ EXTRA_OPENSC_CONFIG="`$(do_export)`" OPENSSL_VERSION="1.0.0e" OPENSSL_URL="https://www2.informatik.hu-berlin.de/~morgner/files/openssl-1.0.0e.tar.gz" EXTRA_OPENSSL_CONFIG="experimental-pace" win32/installer_from_build.sh -win: +src/opensc/win32/build/image/opensc/lib/libnpa.la: src/opensc/win32/build/image/opensc/lib/libopensc.la $(fixup_la) - ./configure \ + export ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes; ./configure \ --sbindir=/bin \ --prefix=/ \ --host=i586-mingw32msvc \ @@ -52,6 +52,10 @@ win: make install DESTDIR=$(shell pwd)/src/opensc/win32/build/image/opensc $(restore_la) +win-opensc: src/opensc/win32/build/image/opensc/lib/libopensc.la + +win: src/opensc/win32/build/image/opensc/lib/libnpa.la + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnpa.pc libnpa.pc: