machine-sdk: split out common configuration

Signed-off-by: Ross Burton <ross.burton@intel.com>

3 files changed, 38 insertions, 70 deletions

diff --git a/conf/machine-sdk/i686-mingw32.conf b/conf/machine-sdk/i686-mingw32.conf
index f85b05d..5090168 100644
--- a/conf/machine-sdk/i686-mingw32.conf
+++ b/conf/machine-sdk/i686-mingw32.conf
@@ -1,37 +1,3 @@
 SDK_ARCH = "i686"
-SDK_OS = "mingw32"
 
-GCCTHREADS_mingw32 = "win32"
-
-PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime"
-PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime"
-PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime"
-PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-gettext"
-PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv"
-
-USE_NLS_mingw32 = "no"
-
-FILES_${PN}-staticdev_append_mingw32 = " ${libdir}/*.lib"
-ALLOW_EMPTY_${PN}_mingw32 = "1"
-
-# Do what amounts to a NOOP
-SDK_PACKAGING_FUNC = "do_compile"
-
-# Causes an endless loop
-#SDKTAROPTS_append = " -h --hard-dereference"
-
-SDKUSE_NLS = "no"
-SDKIMAGE_LINGUAS = ""
-SDK_DEPENDS_remove = "nativesdk-glibc-locale"
-
-SDKPKGSUFFIX = "nativesdk-mingw32"
-
-MACHINEOVERRIDES .= ":sdkmingw32"
-
-export WINDRES = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}"
-export RC = "${WINDRES}"
-
-BB_HASHBASE_WHITELIST_append = " WINDRES RC"
-
-# Needed to override no-static-libs.inc
-DISABLE_STATIC_mingw32 = ""
+require conf/machine-sdk/include/mingw32-common.inc
diff --git a/conf/machine-sdk/include/mingw32-common.inc b/conf/machine-sdk/include/mingw32-common.inc
new file mode 100644
index 0000000..53bac4c
--- /dev/null
+++ b/conf/machine-sdk/include/mingw32-common.inc
@@ -0,0 +1,36 @@
+SDK_OS = "mingw32"
+
+GCCTHREADS_mingw32 = "win32"
+
+PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime"
+PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime"
+PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime"
+PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-gettext"
+PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv"
+
+USE_NLS_mingw32 = "no"
+
+FILES_${PN}-staticdev_append_mingw32 = " ${libdir}/*.lib"
+ALLOW_EMPTY_${PN}_mingw32 = "1"
+
+# Do what amounts to a NOOP
+SDK_PACKAGING_FUNC = "do_compile"
+
+# Causes an endless loop
+#SDKTAROPTS_append = " -h --hard-dereference"
+
+SDKUSE_NLS = "no"
+SDKIMAGE_LINGUAS = ""
+SDK_DEPENDS_remove = "nativesdk-glibc-locale"
+
+SDKPKGSUFFIX = "nativesdk-mingw32"
+
+MACHINEOVERRIDES .= ":sdkmingw32"
+
+export WINDRES = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}"
+export RC = "${WINDRES}"
+
+BB_HASHBASE_WHITELIST_append = " WINDRES RC"
+
+# Needed to override no-static-libs.inc
+DISABLE_STATIC_mingw32 = ""
diff --git a/conf/machine-sdk/x86_64-mingw32.conf b/conf/machine-sdk/x86_64-mingw32.conf
index ec801c3..fc53822 100644
--- a/conf/machine-sdk/x86_64-mingw32.conf
+++ b/conf/machine-sdk/x86_64-mingw32.conf
@@ -1,37 +1,3 @@
 SDK_ARCH = "x86_64"
-SDK_OS = "mingw32"
 
-GCCTHREADS_mingw32 = "win32"
-
-PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime"
-PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime"
-PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime"
-PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-gettext"
-PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv"
-
-USE_NLS_mingw32 = "no"
-
-FILES_${PN}-staticdev_append_mingw32 = " ${libdir}/*.lib"
-ALLOW_EMPTY_${PN}_mingw32 = "1"
-
-# Do what amounts to a NOOP
-SDK_PACKAGING_FUNC = "do_compile"
-
-# Causes an endless loop
-#SDKTAROPTS_append = " -h --hard-dereference"
-
-SDKUSE_NLS = "no"
-SDKIMAGE_LINGUAS = ""
-SDK_DEPENDS_remove = "nativesdk-glibc-locale"
-
-SDKPKGSUFFIX = "nativesdk-mingw32"
-
-MACHINEOVERRIDES .= ":sdkmingw32"
-
-export WINDRES = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}"
-export RC = "${WINDRES}"
-
-BB_HASHBASE_WHITELIST_append = " WINDRES RC"
-
-# Needed to override no-static-libs.inc
-DISABLE_STATIC_mingw32 = ""
+require conf/machine-sdk/include/mingw32-common.inc