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