mirror of https://git.wownero.com/dsc/mxe.git
merge
This commit is contained in:
commit
00b505537a
|
@ -0,0 +1,27 @@
|
||||||
|
# This file is part of mingw-cross-env.
|
||||||
|
# See doc/index.html for further information.
|
||||||
|
|
||||||
|
# cunit
|
||||||
|
PKG := cunit
|
||||||
|
$(PKG)_IGNORE :=
|
||||||
|
$(PKG)_VERSION := 2.1-0
|
||||||
|
$(PKG)_CHECKSUM := 05920c1defda3527cee3bc82fb9eadf45c5ea7a1
|
||||||
|
$(PKG)_SUBDIR := CUnit-$($(PKG)_VERSION)
|
||||||
|
$(PKG)_FILE := CUnit-$($(PKG)_VERSION)-src.tar.gz
|
||||||
|
$(PKG)_WEBSITE := http://cunit.sourceforge.net/
|
||||||
|
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/cunit/CUnit/$($(PKG)_VERSION)/$($(PKG)_FILE)
|
||||||
|
$(PKG)_DEPS := gcc
|
||||||
|
|
||||||
|
define $(PKG)_UPDATE
|
||||||
|
$(call SOURCEFORGE_FILES,http://sourceforge.net/projects/cunit/files/) | \
|
||||||
|
$(SED) -n 's,.*CUnit-\([0-9][^>]*\)-src\.tar.*,\1,p' | \
|
||||||
|
tail -1
|
||||||
|
endef
|
||||||
|
|
||||||
|
define $(PKG)_BUILD
|
||||||
|
cd '$(1)' && ./configure \
|
||||||
|
--host='$(TARGET)' \
|
||||||
|
--disable-shared \
|
||||||
|
--prefix='$(PREFIX)/$(TARGET)'
|
||||||
|
$(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA=
|
||||||
|
endef
|
|
@ -1,10 +1,13 @@
|
||||||
This file is part of mingw-cross-env.
|
This file is part of mingw-cross-env.
|
||||||
See doc/index.html for further information.
|
See doc/index.html for further information.
|
||||||
|
|
||||||
diff -urN a/gsoap/Makefile.am b/gsoap/Makefile.am
|
This patch has been taken from:
|
||||||
--- a/gsoap/Makefile.am 2009-11-07 21:07:06.000000000 +0100
|
http://sourceforge.net/tracker/index.php?func=detail&aid=2937534&group_id=52781&atid=468023
|
||||||
+++ b/gsoap/Makefile.am 2010-01-22 21:33:36.000000000 +0100
|
|
||||||
@@ -31,22 +31,26 @@
|
diff --git a/gsoap/Makefile.am b/gsoap/Makefile.am
|
||||||
|
--- a/gsoap/Makefile.am
|
||||||
|
+++ b/gsoap/Makefile.am
|
||||||
|
@@ -31,22 +31,26 @@ stdsoap2_ssl.c: stdsoap2.cpp
|
||||||
stdsoap2_ssl_cpp.cpp: stdsoap2.cpp
|
stdsoap2_ssl_cpp.cpp: stdsoap2.cpp
|
||||||
$(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp
|
$(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp
|
||||||
|
|
||||||
|
@ -26,12 +29,11 @@ diff -urN a/gsoap/Makefile.am b/gsoap/Makefile.am
|
||||||
-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp
|
-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp
|
||||||
+libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
|
+libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
|
||||||
libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
|
libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
|
||||||
-libgsoapssl_a_SOURCES = stdsoap2_ssl.c
|
libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c
|
||||||
+libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c
|
libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
|
||||||
libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
|
-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom.cpp
|
||||||
-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp
|
|
||||||
+libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
|
+libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
|
||||||
libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
|
libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
|
||||||
|
|
||||||
-BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES)
|
-BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES)
|
||||||
+BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
|
+BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
This file is part of mingw-cross-env.
|
||||||
|
See doc/index.html for further information.
|
||||||
|
|
||||||
|
This patch has been taken from:
|
||||||
|
http://permalink.gmane.org/gmane.text.xml.soap.gsoap/1933
|
||||||
|
|
||||||
|
diff -urN a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
|
||||||
|
--- a/gsoap/stdsoap2.h 2010-09-19 01:20:12.000000000 +0200
|
||||||
|
+++ b/gsoap/stdsoap2.h 2010-09-19 21:00:31.442187011 +0200
|
||||||
|
@@ -536,6 +536,7 @@
|
||||||
|
|
||||||
|
#ifdef WITH_C_LOCALE
|
||||||
|
# include <xlocale.h>
|
||||||
|
+# include <locale.h>
|
||||||
|
#else
|
||||||
|
# undef HAVE_STRTOF_L
|
||||||
|
# undef HAVE_STRTOD_L
|
|
@ -4,8 +4,8 @@
|
||||||
# gSOAP
|
# gSOAP
|
||||||
PKG := gsoap
|
PKG := gsoap
|
||||||
$(PKG)_IGNORE :=
|
$(PKG)_IGNORE :=
|
||||||
$(PKG)_VERSION := 2.7.17
|
$(PKG)_VERSION := 2.8.0
|
||||||
$(PKG)_CHECKSUM := 573a08ab7d8ca2d970158911482c308484fdd5ed
|
$(PKG)_CHECKSUM := 516559068a61a47b438852f8cb7ad15a4b26c162
|
||||||
$(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG))
|
$(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG))
|
||||||
$(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip
|
$(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip
|
||||||
$(PKG)_WEBSITE := http://gsoap2.sourceforge.net/
|
$(PKG)_WEBSITE := http://gsoap2.sourceforge.net/
|
||||||
|
@ -34,7 +34,7 @@ define $(PKG)_BUILD
|
||||||
|
|
||||||
# Native build to get tools wsdl2h and soapcpp2
|
# Native build to get tools wsdl2h and soapcpp2
|
||||||
cd '$(1)' && ./configure \
|
cd '$(1)' && ./configure \
|
||||||
--enable-openssl
|
--enable-gnutls
|
||||||
|
|
||||||
# Parallel bulds can fail
|
# Parallel bulds can fail
|
||||||
$(MAKE) -C '$(1)'/gsoap -j 1
|
$(MAKE) -C '$(1)'/gsoap -j 1
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
# ImageMagick
|
# ImageMagick
|
||||||
PKG := imagemagick
|
PKG := imagemagick
|
||||||
$(PKG)_IGNORE :=
|
$(PKG)_IGNORE :=
|
||||||
$(PKG)_VERSION := 6.6.4-2
|
$(PKG)_VERSION := 6.6.4-4
|
||||||
$(PKG)_CHECKSUM := da0a869614efa53304e674716bb34105296ad759
|
$(PKG)_CHECKSUM := 1e36c3c9a9a9b800278c790ba7de781ecba29e14
|
||||||
$(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION)
|
$(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION)
|
||||||
$(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.bz2
|
$(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.bz2
|
||||||
$(PKG)_WEBSITE := http://www.imagemagick.org/
|
$(PKG)_WEBSITE := http://www.imagemagick.org/
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
# PostgreSQL
|
# PostgreSQL
|
||||||
PKG := postgresql
|
PKG := postgresql
|
||||||
$(PKG)_IGNORE :=
|
$(PKG)_IGNORE :=
|
||||||
$(PKG)_VERSION := 8.4.4
|
$(PKG)_VERSION := 9.0.0
|
||||||
$(PKG)_CHECKSUM := 02592977a601976f8bae7bc3a5c69710d4d0344d
|
$(PKG)_CHECKSUM := ed2f83cd1a83c40dcbe0ba19ee3ba2a7faa0de3d
|
||||||
$(PKG)_SUBDIR := postgresql-$($(PKG)_VERSION)
|
$(PKG)_SUBDIR := postgresql-$($(PKG)_VERSION)
|
||||||
$(PKG)_FILE := postgresql-$($(PKG)_VERSION).tar.bz2
|
$(PKG)_FILE := postgresql-$($(PKG)_VERSION).tar.bz2
|
||||||
$(PKG)_WEBSITE := http://www.postgresql.org/
|
$(PKG)_WEBSITE := http://www.postgresql.org/
|
||||||
|
|
Loading…
Reference in New Issue