1*5b11f0d3SYuri Dario--- misc/xmlsec1-1.2.14/src/Makefile.in 2009-12-05 22:19:34.000000000 +0100 2*5b11f0d3SYuri Dario+++ misc/build/xmlsec1-1.2.14/src/Makefile.in 2014-11-26 22:02:00.000000000 +0100 3*5b11f0d3SYuri Dario@@ -12,6 +12,11 @@ 4*5b11f0d3SYuri Dario # but WITHOUT ANY WARRANTY, to the extent permitted by law; without 5*5b11f0d3SYuri Dario # even the implied warranty of MERCHANTABILITY or FITNESS FOR A 6*5b11f0d3SYuri Dario # PARTICULAR PURPOSE. 7*5b11f0d3SYuri Dario+ 8*5b11f0d3SYuri Dario+OS2_LA_NAME=xmlsec1 9*5b11f0d3SYuri Dario+OS2_DLL_NAME=xmlsec1 10*5b11f0d3SYuri Dario+OS2_DLL_OBJ=$(libxmlsec1_la_OBJECTS:%.lo=%.o) 11*5b11f0d3SYuri Dario+OS2_DLL_LIBS=-lxml2 -lz -lm -lurpo -lmmap -lpthread $(LIBS) 12*5b11f0d3SYuri Dario 13*5b11f0d3SYuri Dario @SET_MAKE@ 14*5b11f0d3SYuri Dario 15*5b11f0d3SYuri Dario@@ -736,7 +741,7 @@ 16*5b11f0d3SYuri Dario done 17*5b11f0d3SYuri Dario check-am: all-am 18*5b11f0d3SYuri Dario check: check-recursive 19*5b11f0d3SYuri Dario-all-am: Makefile $(LTLIBRARIES) 20*5b11f0d3SYuri Dario+all-am: Makefile $(LTLIBRARIES) $(OS2_DLL_NAME).dll 21*5b11f0d3SYuri Dario installdirs: installdirs-recursive 22*5b11f0d3SYuri Dario installdirs-am: 23*5b11f0d3SYuri Dario for dir in "$(DESTDIR)$(libdir)"; do \ 24*5b11f0d3SYuri Dario@@ -861,3 +866,13 @@ 25*5b11f0d3SYuri Dario # Tell versions [3.59,3.63) of GNU make to not export all variables. 26*5b11f0d3SYuri Dario # Otherwise a system limit (for SysV at least) may be exceeded. 27*5b11f0d3SYuri Dario .NOEXPORT: 28*5b11f0d3SYuri Dario+ 29*5b11f0d3SYuri Dario+$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la 30*5b11f0d3SYuri Dario+ cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a 31*5b11f0d3SYuri Dario+ echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" > $(OS2_DLL_NAME).def 32*5b11f0d3SYuri Dario+ echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def 33*5b11f0d3SYuri Dario+ echo "EXPORTS" >> $(OS2_DLL_NAME).def 34*5b11f0d3SYuri Dario+ emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def 35*5b11f0d3SYuri Dario+ gcc -g -Zbin-files -Zhigh-mem -Zomf -Zdll $(OS2_DLL_NAME).def -o $@ $(OS2_DLL_OBJ) $(OS2_DLL_LIBS) 36*5b11f0d3SYuri Dario+ emximp -o .libs/$(OS2_LA_NAME).a $(OS2_DLL_NAME).def 37*5b11f0d3SYuri Dario+ emximp -o .libs/$(OS2_LA_NAME).lib $(OS2_DLL_NAME).def 38*5b11f0d3SYuri Dario--- misc/xmlsec1-1.2.14/src/nss/Makefile.in 2014-11-26 22:02:36.000000000 +0100 39*5b11f0d3SYuri Dario+++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.in 2014-11-26 22:02:28.000000000 +0100 40*5b11f0d3SYuri Dario@@ -12,6 +12,11 @@ 41*5b11f0d3SYuri Dario # but WITHOUT ANY WARRANTY, to the extent permitted by law; without 42*5b11f0d3SYuri Dario # even the implied warranty of MERCHANTABILITY or FITNESS FOR A 43*5b11f0d3SYuri Dario # PARTICULAR PURPOSE. 44*5b11f0d3SYuri Dario+ 45*5b11f0d3SYuri Dario+OS2_LA_NAME=xmlsec1-nss 46*5b11f0d3SYuri Dario+OS2_DLL_NAME=xmlsec1n 47*5b11f0d3SYuri Dario+OS2_DLL_OBJ=$(libxmlsec1_nss_la_OBJECTS:%.lo=%.o) 48*5b11f0d3SYuri Dario+OS2_DLL_LIBS=-l../.libs/xmlsec1 -lxml2 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 $(LIBS) 49*5b11f0d3SYuri Dario 50*5b11f0d3SYuri Dario @SET_MAKE@ 51*5b11f0d3SYuri Dario 52*5b11f0d3SYuri Dario@@ -691,7 +696,7 @@ 53*5b11f0d3SYuri Dario done 54*5b11f0d3SYuri Dario check-am: all-am 55*5b11f0d3SYuri Dario check: check-am 56*5b11f0d3SYuri Dario-all-am: Makefile $(LTLIBRARIES) 57*5b11f0d3SYuri Dario+all-am: Makefile $(LTLIBRARIES) $(OS2_DLL_NAME).dll 58*5b11f0d3SYuri Dario installdirs: 59*5b11f0d3SYuri Dario for dir in "$(DESTDIR)$(libdir)"; do \ 60*5b11f0d3SYuri Dario test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 61*5b11f0d3SYuri Dario@@ -812,3 +817,13 @@ 62*5b11f0d3SYuri Dario # Tell versions [3.59,3.63) of GNU make to not export all variables. 63*5b11f0d3SYuri Dario # Otherwise a system limit (for SysV at least) may be exceeded. 64*5b11f0d3SYuri Dario .NOEXPORT: 65*5b11f0d3SYuri Dario+ 66*5b11f0d3SYuri Dario+$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la 67*5b11f0d3SYuri Dario+ cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a 68*5b11f0d3SYuri Dario+ echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" > $(OS2_DLL_NAME).def 69*5b11f0d3SYuri Dario+ echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def 70*5b11f0d3SYuri Dario+ echo "EXPORTS" >> $(OS2_DLL_NAME).def 71*5b11f0d3SYuri Dario+ emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def 72*5b11f0d3SYuri Dario+ gcc -g -Zbin-files -Zhigh-mem -Zomf -Zdll $(OS2_DLL_NAME).def -o $@ $(OS2_DLL_OBJ) $(OS2_DLL_LIBS) 73*5b11f0d3SYuri Dario+ emximp -o .libs/$(OS2_LA_NAME).a $(OS2_DLL_NAME).def 74*5b11f0d3SYuri Dario+ emximp -o .libs/$(OS2_LA_NAME).lib $(OS2_DLL_NAME).def 75*5b11f0d3SYuri Dario--- misc/xmlsec1-1.2.14/src/nss/keywrapers.c 2014-11-26 21:59:58.000000000 +0100 76*5b11f0d3SYuri Dario+++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c 2014-11-26 21:50:14.000000000 +0100 77*5b11f0d3SYuri Dario@@ -1126,7 +1126,7 @@ 78*5b11f0d3SYuri Dario NULL, /* void* reserved1; */ 79*5b11f0d3SYuri Dario }; 80*5b11f0d3SYuri Dario 81*5b11f0d3SYuri Dario-#ifndef __MINGW32__ 82*5b11f0d3SYuri Dario+#if !defined(__MINGW32__) && !defined(__KLIBC__) 83*5b11f0d3SYuri Dario /** 84*5b11f0d3SYuri Dario * xmlSecNssTransformKWAes128GetKlass: 85*5b11f0d3SYuri Dario * 86*5b11f0d3SYuri Dario@@ -1199,7 +1199,7 @@ 87*5b11f0d3SYuri Dario NULL, /* void* reserved1; */ 88*5b11f0d3SYuri Dario }; 89*5b11f0d3SYuri Dario 90*5b11f0d3SYuri Dario-#ifndef __MINGW32__ 91*5b11f0d3SYuri Dario+#if !defined(__MINGW32__) && !defined(__KLIBC__) 92*5b11f0d3SYuri Dario /** 93*5b11f0d3SYuri Dario * xmlSecNssTransformKWDes3GetKlass: 94*5b11f0d3SYuri Dario * 95