diff options
author | Ross Burton <ross.burton@intel.com> | 2018-04-27 13:08:17 +0100 |
---|---|---|
committer | Ross Burton <ross.burton@intel.com> | 2018-04-27 13:33:19 +0100 |
commit | a2a461805fa7e0a800e0553373469a835a330ad6 (patch) | |
tree | 40de144342dadccc60c44629432e1e097b6ddccb | |
parent | 6106b73926394e054b8433c0a9e24149470d1baf (diff) | |
download | meta-mingw-a2a461805fa7e0a800e0553373469a835a330ad6.tar.gz |
machine-sdk: split out common configuration
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r-- | conf/machine-sdk/i686-mingw32.conf | 36 | ||||
-rw-r--r-- | conf/machine-sdk/include/mingw32-common.inc | 36 | ||||
-rw-r--r-- | conf/machine-sdk/x86_64-mingw32.conf | 36 |
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 @@ | |||
1 | SDK_ARCH = "i686" | 1 | SDK_ARCH = "i686" |
2 | SDK_OS = "mingw32" | ||
3 | 2 | ||
4 | GCCTHREADS_mingw32 = "win32" | 3 | require conf/machine-sdk/include/mingw32-common.inc |
5 | |||
6 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime" | ||
7 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime" | ||
8 | PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" | ||
9 | PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-gettext" | ||
10 | PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" | ||
11 | |||
12 | USE_NLS_mingw32 = "no" | ||
13 | |||
14 | FILES_${PN}-staticdev_append_mingw32 = " ${libdir}/*.lib" | ||
15 | ALLOW_EMPTY_${PN}_mingw32 = "1" | ||
16 | |||
17 | # Do what amounts to a NOOP | ||
18 | SDK_PACKAGING_FUNC = "do_compile" | ||
19 | |||
20 | # Causes an endless loop | ||
21 | #SDKTAROPTS_append = " -h --hard-dereference" | ||
22 | |||
23 | SDKUSE_NLS = "no" | ||
24 | SDKIMAGE_LINGUAS = "" | ||
25 | SDK_DEPENDS_remove = "nativesdk-glibc-locale" | ||
26 | |||
27 | SDKPKGSUFFIX = "nativesdk-mingw32" | ||
28 | |||
29 | MACHINEOVERRIDES .= ":sdkmingw32" | ||
30 | |||
31 | export WINDRES = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}" | ||
32 | export RC = "${WINDRES}" | ||
33 | |||
34 | BB_HASHBASE_WHITELIST_append = " WINDRES RC" | ||
35 | |||
36 | # Needed to override no-static-libs.inc | ||
37 | DISABLE_STATIC_mingw32 = "" | ||
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 @@ | |||
1 | SDK_OS = "mingw32" | ||
2 | |||
3 | GCCTHREADS_mingw32 = "win32" | ||
4 | |||
5 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime" | ||
6 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime" | ||
7 | PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" | ||
8 | PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-gettext" | ||
9 | PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" | ||
10 | |||
11 | USE_NLS_mingw32 = "no" | ||
12 | |||
13 | FILES_${PN}-staticdev_append_mingw32 = " ${libdir}/*.lib" | ||
14 | ALLOW_EMPTY_${PN}_mingw32 = "1" | ||
15 | |||
16 | # Do what amounts to a NOOP | ||
17 | SDK_PACKAGING_FUNC = "do_compile" | ||
18 | |||
19 | # Causes an endless loop | ||
20 | #SDKTAROPTS_append = " -h --hard-dereference" | ||
21 | |||
22 | SDKUSE_NLS = "no" | ||
23 | SDKIMAGE_LINGUAS = "" | ||
24 | SDK_DEPENDS_remove = "nativesdk-glibc-locale" | ||
25 | |||
26 | SDKPKGSUFFIX = "nativesdk-mingw32" | ||
27 | |||
28 | MACHINEOVERRIDES .= ":sdkmingw32" | ||
29 | |||
30 | export WINDRES = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}" | ||
31 | export RC = "${WINDRES}" | ||
32 | |||
33 | BB_HASHBASE_WHITELIST_append = " WINDRES RC" | ||
34 | |||
35 | # Needed to override no-static-libs.inc | ||
36 | 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 @@ | |||
1 | SDK_ARCH = "x86_64" | 1 | SDK_ARCH = "x86_64" |
2 | SDK_OS = "mingw32" | ||
3 | 2 | ||
4 | GCCTHREADS_mingw32 = "win32" | 3 | require conf/machine-sdk/include/mingw32-common.inc |
5 | |||
6 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime" | ||
7 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime" | ||
8 | PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" | ||
9 | PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-gettext" | ||
10 | PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" | ||
11 | |||
12 | USE_NLS_mingw32 = "no" | ||
13 | |||
14 | FILES_${PN}-staticdev_append_mingw32 = " ${libdir}/*.lib" | ||
15 | ALLOW_EMPTY_${PN}_mingw32 = "1" | ||
16 | |||
17 | # Do what amounts to a NOOP | ||
18 | SDK_PACKAGING_FUNC = "do_compile" | ||
19 | |||
20 | # Causes an endless loop | ||
21 | #SDKTAROPTS_append = " -h --hard-dereference" | ||
22 | |||
23 | SDKUSE_NLS = "no" | ||
24 | SDKIMAGE_LINGUAS = "" | ||
25 | SDK_DEPENDS_remove = "nativesdk-glibc-locale" | ||
26 | |||
27 | SDKPKGSUFFIX = "nativesdk-mingw32" | ||
28 | |||
29 | MACHINEOVERRIDES .= ":sdkmingw32" | ||
30 | |||
31 | export WINDRES = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}" | ||
32 | export RC = "${WINDRES}" | ||
33 | |||
34 | BB_HASHBASE_WHITELIST_append = " WINDRES RC" | ||
35 | |||
36 | # Needed to override no-static-libs.inc | ||
37 | DISABLE_STATIC_mingw32 = "" | ||