Merge trini/canadian-merge branch into org.openembedded.dev, fixup a

conflict on checksums.ini

8 files changed, 88 insertions, 0 deletions

diff --git a/packages/mingw/mingw-runtime-headers.inc b/packages/mingw/mingw-runtime-headers.inc
new file mode 100644
index 0000000000..3bc5cd4307
--- /dev/null
+++ b/packages/mingw/mingw-runtime-headers.inc
@@ -0,0 +1,19 @@
+DEPENDS = "mingw-w32api-headers"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+
+do_configure() {
+	:
+}
+
+do_compile() {
+	:
+}
+
+do_install() {
+	:
+}
+
+do_stage() {
+	mkdir -p ${STAGING_INCDIR}
+	cp -r ${S}/include/* ${STAGING_INCDIR}/
+}
diff --git a/packages/mingw/mingw-runtime-headers_3.15.1.bb b/packages/mingw/mingw-runtime-headers_3.15.1.bb
new file mode 100644
index 0000000000..8c77b6a594
--- /dev/null
+++ b/packages/mingw/mingw-runtime-headers_3.15.1.bb
@@ -0,0 +1,3 @@
+require mingw-runtime_${PV}.bb
+
+require mingw-runtime-headers.inc
diff --git a/packages/mingw/mingw-runtime.inc b/packages/mingw/mingw-runtime.inc
new file mode 100644
index 0000000000..d984911fff
--- /dev/null
+++ b/packages/mingw/mingw-runtime.inc
@@ -0,0 +1,17 @@
+inherit canadian-native autotools
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial mingw-w32api"
+
+PROVIDES = "virtual/${TARGET_PREFIX}libc virtual/${TARGET_PREFIX}libc-for-gcc"
+
+DEFAULT_PREFERENCE = "0"
+DEFAULT_PREFERENCE_sdk-mingw32 = "1"
+
+PACKAGES = ""
+
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+do_configure() {
+	oe_runconf
+}
diff --git a/packages/mingw/mingw-runtime_3.15.1.bb b/packages/mingw/mingw-runtime_3.15.1.bb
new file mode 100644
index 0000000000..c691d0749d
--- /dev/null
+++ b/packages/mingw/mingw-runtime_3.15.1.bb
@@ -0,0 +1,7 @@
+require mingw-runtime.inc
+
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mingw/mingwrt-${PV}-mingw32-src.tar.gz"
+
+S = "${WORKDIR}/mingwrt-${PV}-mingw32"
diff --git a/packages/mingw/mingw-w32api-headers.inc b/packages/mingw/mingw-w32api-headers.inc
new file mode 100644
index 0000000000..bbd97f9593
--- /dev/null
+++ b/packages/mingw/mingw-w32api-headers.inc
@@ -0,0 +1,19 @@
+DEPENDS = ""
+PROVIDES = "mingw-w32api-headers"
+
+do_configure() {
+	:
+}
+
+do_compile() {
+	:
+}
+
+do_install() {
+	:
+}
+
+do_stage() {
+	mkdir -p ${STAGING_INCDIR}
+	cp -r ${S}/include/* ${STAGING_INCDIR}/
+}
diff --git a/packages/mingw/mingw-w32api-headers_3.13.bb b/packages/mingw/mingw-w32api-headers_3.13.bb
new file mode 100644
index 0000000000..5d17f8db87
--- /dev/null
+++ b/packages/mingw/mingw-w32api-headers_3.13.bb
@@ -0,0 +1,3 @@
+require mingw-w32api_${PV}.bb
+
+require mingw-w32api-headers.inc
diff --git a/packages/mingw/mingw-w32api.inc b/packages/mingw/mingw-w32api.inc
new file mode 100644
index 0000000000..ecb1cd290a
--- /dev/null
+++ b/packages/mingw/mingw-w32api.inc
@@ -0,0 +1,13 @@
+inherit canadian-native autotools
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
+
+PROVIDES = "mingw-w32api"
+
+DEFAULT_PREFERENCE = "0"
+DEFAULT_PREFERENCE_sdk-mingw32 = "1"
+
+PACKAGES = ""
+
+B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/packages/mingw/mingw-w32api_3.13.bb b/packages/mingw/mingw-w32api_3.13.bb
new file mode 100644
index 0000000000..1b8064f913
--- /dev/null
+++ b/packages/mingw/mingw-w32api_3.13.bb
@@ -0,0 +1,7 @@
+require mingw-w32api.inc
+
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mingw/w32api-${PV}-mingw32-src.tar.gz"
+
+S = "${WORKDIR}/w32api-${PV}-mingw32"