| 1 |
flameeyes 11/07/03 17:13:16 |
| 2 |
|
| 3 |
Added: opensc-0.12.0-crossbuild.patch |
| 4 |
Log: |
| 5 |
Add a patch to fix some corner cases in build, where the just-built opensc tools used the old library. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: opensc-0.12.0-crossbuild.patch |
| 16 |
=================================================================== |
| 17 |
Index: opensc-0.12.0/src/pkcs11/Makefile.am |
| 18 |
=================================================================== |
| 19 |
--- opensc-0.12.0.orig/src/pkcs11/Makefile.am |
| 20 |
+++ opensc-0.12.0/src/pkcs11/Makefile.am |
| 21 |
@@ -15,9 +15,10 @@ OPENSC_PKCS11_SRC = pkcs11-global.c pkcs |
| 22 |
mechanism.c openssl.c framework-pkcs15.c \ |
| 23 |
framework-pkcs15init.c debug.c opensc-pkcs11.exports \ |
| 24 |
pkcs11-display.c pkcs11-display.h |
| 25 |
-OPENSC_PKCS11_LIBS = $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) \ |
| 26 |
+OPENSC_PKCS11_LIBS = \ |
| 27 |
$(top_builddir)/src/common/libcompat.la \ |
| 28 |
- $(top_builddir)/src/libopensc/libopensc.la |
| 29 |
+ $(top_builddir)/src/libopensc/libopensc.la \ |
| 30 |
+ $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) |
| 31 |
|
| 32 |
libpkcs11_la_SOURCES = libpkcs11.c |
| 33 |
libpkcs11_la_LIBADD = $(LTLIB_LIBS) |
| 34 |
@@ -35,7 +36,7 @@ onepin_opensc_pkcs11_la_LDFLAGS = $(AM_L |
| 35 |
-module -shared -avoid-version -no-undefined |
| 36 |
|
| 37 |
pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11-spy.exports |
| 38 |
-pkcs11_spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) libpkcs11.la |
| 39 |
+pkcs11_spy_la_LIBADD = libpkcs11.la $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) |
| 40 |
pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \ |
| 41 |
-export-symbols "$(srcdir)/pkcs11-spy.exports" \ |
| 42 |
-module -shared -avoid-version -no-undefined |
| 43 |
Index: opensc-0.12.0/src/tools/Makefile.am |
| 44 |
=================================================================== |
| 45 |
--- opensc-0.12.0.orig/src/tools/Makefile.am |
| 46 |
+++ opensc-0.12.0/src/tools/Makefile.am |
| 47 |
@@ -24,8 +24,9 @@ opensc_explorer_LDADD = $(OPTIONAL_READL |
| 48 |
pkcs15_tool_SOURCES = pkcs15-tool.c util.c |
| 49 |
pkcs15_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) |
| 50 |
pkcs11_tool_SOURCES = pkcs11-tool.c util.c |
| 51 |
-pkcs11_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \ |
| 52 |
- $(top_builddir)/src/pkcs11/libpkcs11.la |
| 53 |
+pkcs11_tool_LDADD = \ |
| 54 |
+ $(top_builddir)/src/pkcs11/libpkcs11.la \ |
| 55 |
+ $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) |
| 56 |
pkcs15_crypt_SOURCES = pkcs15-crypt.c util.c |
| 57 |
pkcs15_crypt_LDADD = $(OPTIONAL_OPENSSL_LIBS) |
| 58 |
cryptoflex_tool_SOURCES = cryptoflex-tool.c util.c |
Archives