summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2014-08-14 14:05:51 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:49 +0100
commit6d78f392f524944a1e32e14e4b1a7e48422a3ece (patch)
tree2c0c89f64d39a113b157200755aa7c865df6c6a3
parent2783ee732a4e1c30ec143509fdf8cce8657e67b7 (diff)
downloadpoky-6d78f392f524944a1e32e14e4b1a7e48422a3ece.tar.gz
gcc: recipe whitespace changes
Consistent use of whitespace in multi-line assignment, with special focus on OECONF modifications. Quotes on separate lines, four-space indentation, one value per line. (From OE-Core rev: d971db8b2259e4c35b871cccf130fba193849560) Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.8.inc186
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.9.inc180
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc46
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc24
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc32
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc28
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc153
-rw-r--r--meta/recipes-devtools/gcc/gcc-target.inc106
-rw-r--r--meta/recipes-devtools/gcc/libgcc.inc35
-rw-r--r--meta/recipes-devtools/gcc/libgfortran.inc29
10 files changed, 429 insertions, 390 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc
index 2816f13a6f..80a3fc4d77 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -15,62 +15,65 @@ NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"
15 15
16LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" 16LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
17 17
18LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 18LIC_FILES_CHKSUM = "\
19 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ 19 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
20 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ 20 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
21 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 21 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
22 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8" 22 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
23 23 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \
24SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ 24"
25 file://0002-uclibc-conf.patch \ 25
26 file://0003-gcc-uclibc-locale-ctype_touplow_t.patch \ 26SRC_URI = "\
27 file://0004-uclibc-locale.patch \ 27 ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
28 file://0005-uclibc-locale-no__x.patch \ 28 file://0002-uclibc-conf.patch \
29 file://0006-uclibc-locale-wchar_fix.patch \ 29 file://0003-gcc-uclibc-locale-ctype_touplow_t.patch \
30 file://0007-uclibc-locale-update.patch \ 30 file://0004-uclibc-locale.patch \
31 file://0008-missing-execinfo_h.patch \ 31 file://0005-uclibc-locale-no__x.patch \
32 file://0009-c99-snprintf.patch \ 32 file://0006-uclibc-locale-wchar_fix.patch \
33 file://0010-c99-complex-ugly-hack.patch \ 33 file://0007-uclibc-locale-update.patch \
34 file://0011-index_macro.patch \ 34 file://0008-missing-execinfo_h.patch \
35 file://0012-libmudflap-susv3-legacy.patch \ 35 file://0009-c99-snprintf.patch \
36 file://0013-libstdc-namespace.patch \ 36 file://0010-c99-complex-ugly-hack.patch \
37 file://0014-sh-pr24836.patch \ 37 file://0011-index_macro.patch \
38 file://0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch \ 38 file://0012-libmudflap-susv3-legacy.patch \
39 file://0016-gcc-poison-system-directories.patch \ 39 file://0013-libstdc-namespace.patch \
40 file://0017-gcc-poison-dir-extend.patch \ 40 file://0014-sh-pr24836.patch \
41 file://0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \ 41 file://0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch \
42 file://0019-64-bit-multilib-hack.patch \ 42 file://0016-gcc-poison-system-directories.patch \
43 file://0020-optional-libstdc.patch \ 43 file://0017-gcc-poison-dir-extend.patch \
44 file://0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch \ 44 file://0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
45 file://0022-COLLECT_GCC_OPTIONS.patch \ 45 file://0019-64-bit-multilib-hack.patch \
46 file://0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \ 46 file://0020-optional-libstdc.patch \
47 file://0024-PR-target-32219.patch \ 47 file://0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch \
48 file://0025-fortran-cross-compile-hack.patch \ 48 file://0022-COLLECT_GCC_OPTIONS.patch \
49 file://0026-libgcc-sjlj-check.patch \ 49 file://0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \
50 file://0027-cpp-honor-sysroot.patch \ 50 file://0024-PR-target-32219.patch \
51 file://0028-MIPS64-Default-to-N64-ABI.patch \ 51 file://0025-fortran-cross-compile-hack.patch \
52 file://0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \ 52 file://0026-libgcc-sjlj-check.patch \
53 file://0030-gcc-Fix-argument-list-too-long-error.patch \ 53 file://0027-cpp-honor-sysroot.patch \
54 file://0031-Disable-sdt.patch \ 54 file://0028-MIPS64-Default-to-N64-ABI.patch \
55 file://0032-libtool.patch \ 55 file://0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \
56 file://0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ 56 file://0030-gcc-Fix-argument-list-too-long-error.patch \
57 file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ 57 file://0031-Disable-sdt.patch \
58 file://0035-wcast-qual-PR-55383.patch \ 58 file://0032-libtool.patch \
59 file://0037-gcc-4.8-PR56797.patch \ 59 file://0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \
60 file://0038-gcc-4.8-build-args.patch \ 60 file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \
61 file://0039-gcc-4.8-PR57717.patch \ 61 file://0035-wcast-qual-PR-55383.patch \
62 file://0040-fix-g++-sysroot.patch \ 62 file://0037-gcc-4.8-PR56797.patch \
63 file://0041-libtool-avoid-libdir.patch \ 63 file://0038-gcc-4.8-build-args.patch \
64 file://0042-pr57748.patch \ 64 file://0039-gcc-4.8-PR57717.patch \
65 file://0043-cpp.patch \ 65 file://0040-fix-g++-sysroot.patch \
66 file://0044-gengtypes.patch \ 66 file://0041-libtool-avoid-libdir.patch \
67 file://0045-gcc-4.8-PR57717-PowerPC-E500v2.patch \ 67 file://0042-pr57748.patch \
68 file://0046-libatomic-deptracking.patch \ 68 file://0043-cpp.patch \
69 file://0047-repomembug.patch \ 69 file://0044-gengtypes.patch \
70 file://0048-PR58854_fix_arm_apcs_epilogue.patch \ 70 file://0045-gcc-4.8-PR57717-PowerPC-E500v2.patch \
71 file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \ 71 file://0046-libatomic-deptracking.patch \
72 file://0050-PR-target-58595.patch \ 72 file://0047-repomembug.patch \
73 " 73 file://0048-PR58854_fix_arm_apcs_epilogue.patch \
74 file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \
75 file://0050-PR-target-58595.patch \
76"
74SRC_URI[md5sum] = "a3d7d63b9cb6b6ea049469a0c4a43c9d" 77SRC_URI[md5sum] = "a3d7d63b9cb6b6ea049469a0c4a43c9d"
75SRC_URI[sha256sum] = "09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8" 78SRC_URI[sha256sum] = "09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8"
76 79
@@ -83,40 +86,47 @@ JAVA = ""
83 86
84LTO = "--enable-lto" 87LTO = "--enable-lto"
85 88
86EXTRA_OECONF_BASE = " ${LTO} \ 89EXTRA_OECONF_BASE = "\
87 --enable-libssp \ 90 ${LTO} \
88 --disable-bootstrap \ 91 --enable-libssp \
89 --disable-libmudflap \ 92 --disable-bootstrap \
90 --with-system-zlib \ 93 --disable-libmudflap \
91 --with-linker-hash-style=${LINKER_HASH_STYLE} \ 94 --with-system-zlib \
92 --enable-linker-build-id \ 95 --with-linker-hash-style=${LINKER_HASH_STYLE} \
93 --with-ppl=no \ 96 --enable-linker-build-id \
94 --with-cloog=no \ 97 --with-ppl=no \
95 --enable-checking=release \ 98 --with-cloog=no \
96 --enable-cheaders=c_global " 99 --enable-checking=release \
97 100 --enable-cheaders=c_global \
98EXTRA_OECONF_INITIAL = "--disable-libmudflap \ 101"
99 --disable-libgomp \ 102
100 --disable-libssp \ 103EXTRA_OECONF_INITIAL = "\
101 --disable-libquadmath \ 104 --disable-libmudflap \
102 --with-system-zlib \ 105 --disable-libgomp \
103 --disable-lto \ 106 --disable-libssp \
104 --disable-plugin \ 107 --disable-libquadmath \
105 --enable-decimal-float=no" 108 --with-system-zlib \
106 109 --disable-lto \
107EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap \ 110 --disable-plugin \
108 --disable-libgomp \ 111 --enable-decimal-float=no \
109 --disable-libquadmath \ 112"
110 --with-system-zlib \ 113
111 --disable-lto \ 114EXTRA_OECONF_INTERMEDIATE = "\
112 --disable-plugin \ 115 --disable-libmudflap \
113 --disable-libssp" 116 --disable-libgomp \
117 --disable-libquadmath \
118 --with-system-zlib \
119 --disable-lto \
120 --disable-plugin \
121 --disable-libssp \
122"
114 123
115EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float " 124EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float "
116 125
117EXTRA_OECONF_PATHS = " \ 126EXTRA_OECONF_PATHS = "\
118 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ 127 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \
119 --with-sysroot=${STAGING_DIR_TARGET} \ 128 --with-sysroot=${STAGING_DIR_TARGET} \
120 --with-build-sysroot=${STAGING_DIR_TARGET}" 129 --with-build-sysroot=${STAGING_DIR_TARGET} \
130"
121 131
122 132
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc
index d1be67d39f..5a1c0281d9 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -15,59 +15,62 @@ NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"
15 15
16LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" 16LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
17 17
18LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 18LIC_FILES_CHKSUM = "\
19 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ 19 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
20 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ 20 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
21 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 21 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
22 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8" 22 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
23 23 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \
24SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ 24"
25 file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ 25
26 file://0002-uclibc-conf.patch \ 26SRC_URI = "\
27 file://0003-gcc-uclibc-locale-ctype_touplow_t.patch \ 27 ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
28 file://0004-uclibc-locale.patch \ 28 file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
29 file://0005-uclibc-locale-no__x.patch \ 29 file://0002-uclibc-conf.patch \
30 file://0006-uclibc-locale-wchar_fix.patch \ 30 file://0003-gcc-uclibc-locale-ctype_touplow_t.patch \
31 file://0007-uclibc-locale-update.patch \ 31 file://0004-uclibc-locale.patch \
32 file://0008-missing-execinfo_h.patch \ 32 file://0005-uclibc-locale-no__x.patch \
33 file://0009-c99-snprintf.patch \ 33 file://0006-uclibc-locale-wchar_fix.patch \
34 file://0010-c99-complex-ugly-hack.patch \ 34 file://0007-uclibc-locale-update.patch \
35 file://0011-index_macro.patch \ 35 file://0008-missing-execinfo_h.patch \
36 file://0013-libstdc-namespace.patch \ 36 file://0009-c99-snprintf.patch \
37 file://0014-sh-pr24836.patch \ 37 file://0010-c99-complex-ugly-hack.patch \
38 file://0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch \ 38 file://0011-index_macro.patch \
39 file://0016-gcc-poison-system-directories.patch \ 39 file://0013-libstdc-namespace.patch \
40 file://0017-gcc-poison-dir-extend.patch \ 40 file://0014-sh-pr24836.patch \
41 file://0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \ 41 file://0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch \
42 file://0019-64-bit-multilib-hack.patch \ 42 file://0016-gcc-poison-system-directories.patch \
43 file://0020-optional-libstdc.patch \ 43 file://0017-gcc-poison-dir-extend.patch \
44 file://0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch \ 44 file://0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
45 file://0022-COLLECT_GCC_OPTIONS.patch \ 45 file://0019-64-bit-multilib-hack.patch \
46 file://0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \ 46 file://0020-optional-libstdc.patch \
47 file://0024-PR-target-32219.patch \ 47 file://0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch \
48 file://0025-fortran-cross-compile-hack.patch \ 48 file://0022-COLLECT_GCC_OPTIONS.patch \
49 file://0026-libgcc-sjlj-check.patch \ 49 file://0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \
50 file://0027-cpp-honor-sysroot.patch \ 50 file://0024-PR-target-32219.patch \
51 file://0028-MIPS64-Default-to-N64-ABI.patch \ 51 file://0025-fortran-cross-compile-hack.patch \
52 file://0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \ 52 file://0026-libgcc-sjlj-check.patch \
53 file://0030-gcc-Fix-argument-list-too-long-error.patch \ 53 file://0027-cpp-honor-sysroot.patch \
54 file://0031-Disable-sdt.patch \ 54 file://0028-MIPS64-Default-to-N64-ABI.patch \
55 file://0032-libtool.patch \ 55 file://0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \
56 file://0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ 56 file://0030-gcc-Fix-argument-list-too-long-error.patch \
57 file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ 57 file://0031-Disable-sdt.patch \
58 file://0037-gcc-4.8-PR56797.patch \ 58 file://0032-libtool.patch \
59 file://0040-fix-g++-sysroot.patch \ 59 file://0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \
60 file://0041-libtool-avoid-libdir.patch \ 60 file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \
61 file://0043-cpp.patch \ 61 file://0037-gcc-4.8-PR56797.patch \
62 file://0044-gengtypes.patch \ 62 file://0040-fix-g++-sysroot.patch \
63 file://0046-libatomic-deptracking.patch \ 63 file://0041-libtool-avoid-libdir.patch \
64 file://0047-repomembug.patch \ 64 file://0043-cpp.patch \
65 file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \ 65 file://0044-gengtypes.patch \
66 file://0050-Revert-Use-dbx_reg_number-for-spanning-registers.patch \ 66 file://0046-libatomic-deptracking.patch \
67 file://0051-eabispe.patch \ 67 file://0047-repomembug.patch \
68 file://0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch \ 68 file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \
69 file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \ 69 file://0050-Revert-Use-dbx_reg_number-for-spanning-registers.patch \
70 " 70 file://0051-eabispe.patch \
71 file://0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch \
72 file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \
73"
71SRC_URI[md5sum] = "fddf71348546af523353bd43d34919c1" 74SRC_URI[md5sum] = "fddf71348546af523353bd43d34919c1"
72SRC_URI[sha256sum] = "d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e" 75SRC_URI[sha256sum] = "d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e"
73 76
@@ -80,40 +83,47 @@ JAVA = ""
80 83
81LTO = "--enable-lto" 84LTO = "--enable-lto"
82 85
83EXTRA_OECONF_BASE = " ${LTO} \ 86EXTRA_OECONF_BASE = "\
84 --enable-libssp \ 87 ${LTO} \
85 --disable-bootstrap \ 88 --enable-libssp \
86 --disable-libmudflap \ 89 --disable-bootstrap \
87 --with-system-zlib \ 90 --disable-libmudflap \
88 --with-linker-hash-style=${LINKER_HASH_STYLE} \ 91 --with-system-zlib \
89 --enable-linker-build-id \ 92 --with-linker-hash-style=${LINKER_HASH_STYLE} \
90 --with-ppl=no \ 93 --enable-linker-build-id \
91 --with-cloog=no \ 94 --with-ppl=no \
92 --enable-checking=release \ 95 --with-cloog=no \
93 --enable-cheaders=c_global " 96 --enable-checking=release \
94 97 --enable-cheaders=c_global \
95EXTRA_OECONF_INITIAL = "--disable-libmudflap \ 98"
96 --disable-libgomp \ 99
97 --disable-libssp \ 100EXTRA_OECONF_INITIAL = "\
98 --disable-libquadmath \ 101 --disable-libmudflap \
99 --with-system-zlib \ 102 --disable-libgomp \
100 --disable-lto \ 103 --disable-libssp \
101 --disable-plugin \ 104 --disable-libquadmath \
102 --enable-decimal-float=no" 105 --with-system-zlib \
103 106 --disable-lto \
104EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap \ 107 --disable-plugin \
105 --disable-libgomp \ 108 --enable-decimal-float=no \
106 --disable-libquadmath \ 109"
107 --with-system-zlib \ 110
108 --disable-lto \ 111EXTRA_OECONF_INTERMEDIATE = "\
109 --disable-plugin \ 112 --disable-libmudflap \
110 --disable-libssp" 113 --disable-libgomp \
114 --disable-libquadmath \
115 --with-system-zlib \
116 --disable-lto \
117 --disable-plugin \
118 --disable-libssp \
119"
111 120
112EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float " 121EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float "
113 122
114EXTRA_OECONF_PATHS = " \ 123EXTRA_OECONF_PATHS = "\
115 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ 124 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \
116 --with-sysroot=${STAGING_DIR_TARGET} \ 125 --with-sysroot=${STAGING_DIR_TARGET} \
117 --with-build-sysroot=${STAGING_DIR_TARGET}" 126 --with-build-sysroot=${STAGING_DIR_TARGET} \
127"
118 128
119 129
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 75fb379956..9c4e98694b 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -29,24 +29,26 @@ EXTRA_OECONF_INTERMEDIATE ?= ""
29GCCMULTILIB ?= "--disable-multilib" 29GCCMULTILIB ?= "--disable-multilib"
30GCCTHREADS ?= "posix" 30GCCTHREADS ?= "posix"
31 31
32EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', True) != 'no']} \ 32EXTRA_OECONF = "\
33 --with-gnu-ld \ 33 ${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', True) != 'no']} \
34 --enable-shared \ 34 --with-gnu-ld \
35 --enable-languages=${LANGUAGES} \ 35 --enable-shared \
36 --enable-threads=${GCCTHREADS} \ 36 --enable-languages=${LANGUAGES} \
37 ${GCCMULTILIB} \ 37 --enable-threads=${GCCTHREADS} \
38 --enable-c99 \ 38 ${GCCMULTILIB} \
39 --enable-long-long \ 39 --enable-c99 \
40 --enable-symvers=gnu \ 40 --enable-long-long \
41 --enable-libstdcxx-pch \ 41 --enable-symvers=gnu \
42 --program-prefix=${TARGET_PREFIX} \ 42 --enable-libstdcxx-pch \
43 --without-local-prefix \ 43 --program-prefix=${TARGET_PREFIX} \
44 ${OPTSPACE} \ 44 --without-local-prefix \
45 ${EXTRA_OECONF_BASE} \ 45 ${OPTSPACE} \
46 ${EXTRA_OECONF_FPU} \ 46 ${EXTRA_OECONF_BASE} \
47 ${EXTRA_OECONF_PATHS} \ 47 ${EXTRA_OECONF_FPU} \
48 ${@get_gcc_mips_plt_setting(bb, d)} \ 48 ${EXTRA_OECONF_PATHS} \
49 ${@get_gcc_multiarch_setting(bb, d)}" 49 ${@get_gcc_mips_plt_setting(bb, d)} \
50 ${@get_gcc_multiarch_setting(bb, d)} \
51"
50 52
51export ac_cv_path_SED = 'sed' 53export ac_cv_path_SED = 'sed'
52export gcc_cv_collect2_libs = 'none required' 54export gcc_cv_collect2_libs = 'none required'
@@ -55,11 +57,11 @@ export gcc_cv_collect2_libs = 'none required'
55# hence being missed by the insane do_configure check). 57# hence being missed by the insane do_configure check).
56 58
57# Build uclibc compilers without cxa_atexit support 59# Build uclibc compilers without cxa_atexit support
58EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" 60EXTRA_OECONF_append_linux = " --enable-__cxa_atexit"
59EXTRA_OECONF_append_libc-uclibc = " --enable-__cxa_atexit" 61EXTRA_OECONF_append_libc-uclibc = " --enable-__cxa_atexit"
60 62
61EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" 63EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
62EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" 64EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
63 65
64EXTRA_OECONF_FPU ??= "" 66EXTRA_OECONF_FPU ??= ""
65CPPFLAGS = "" 67CPPFLAGS = ""
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index f0a03a6519..7da5058ae9 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -9,10 +9,12 @@ GCCMULTILIB = "--enable-multilib"
9 9
10require gcc-configure-common.inc 10require gcc-configure-common.inc
11 11
12EXTRA_OECONF_PATHS = "--with-gxx-include-dir=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_includedir}/c++/${BINV} \ 12EXTRA_OECONF_PATHS = "\
13 --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \ 13 --with-gxx-include-dir=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_includedir}/c++/${BINV} \
14 --with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ 14 --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
15 --with-build-sysroot=${STAGING_DIR_TARGET}" 15 --with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \
16 --with-build-sysroot=${STAGING_DIR_TARGET} \
17"
16# We have to point gcc at a sysroot but we don't need to rebuild if this changes 18# We have to point gcc at a sysroot but we don't need to rebuild if this changes
17# e.g. we switch between different machines with different tunes. 19# e.g. we switch between different machines with different tunes.
18EXTRA_OECONF_PATHS[vardepsexclude] = "TUNE_PKGARCH" 20EXTRA_OECONF_PATHS[vardepsexclude] = "TUNE_PKGARCH"
@@ -82,14 +84,14 @@ FILES_${PN} = "\
82 ${prefix}/${TARGET_SYS}/bin/* \ 84 ${prefix}/${TARGET_SYS}/bin/* \
83 ${prefix}/${TARGET_SYS}/lib/* \ 85 ${prefix}/${TARGET_SYS}/lib/* \
84 ${prefix}/${TARGET_SYS}/usr/include/* \ 86 ${prefix}/${TARGET_SYS}/usr/include/* \
85 " 87"
86INSANE_SKIP_${PN} += "dev-so" 88INSANE_SKIP_${PN} += "dev-so"
87 89
88FILES_${PN}-doc = "\ 90FILES_${PN}-doc = "\
89 ${infodir} \ 91 ${infodir} \
90 ${mandir} \ 92 ${mandir} \
91 ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ 93 ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
92 " 94"
93 95
94EXEEXT = "" 96EXEEXT = ""
95 97
@@ -156,11 +158,13 @@ SYSTEMHEADERS = "/usr/include"
156SYSTEMLIBS = "${target_base_libdir}/" 158SYSTEMLIBS = "${target_base_libdir}/"
157SYSTEMLIBS1 = "${target_libdir}/" 159SYSTEMLIBS1 = "${target_libdir}/"
158 160
159EXTRA_OECONF += " --enable-poison-system-directories" 161EXTRA_OECONF += "--enable-poison-system-directories"
160 162
161EXTRA_OECONF += "--disable-libunwind-exceptions \ 163EXTRA_OECONF += "\
162 --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \ 164 --disable-libunwind-exceptions \
163 --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix}" 165 --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \
166 --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix} \
167"
164 168
165# gcc 4.7 needs -isystem 169# gcc 4.7 needs -isystem
166export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" 170export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 23a6d4beb4..64196ee106 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -11,22 +11,24 @@ CROSS_TARGET_SYS_DIR_append = ".${PN}"
11 11
12# This is intended to be a -very- basic config 12# This is intended to be a -very- basic config
13# sysroot is needed in case we use libc-initial 13# sysroot is needed in case we use libc-initial
14EXTRA_OECONF = "--with-newlib \ 14EXTRA_OECONF = "\
15 --without-headers \ 15 --with-newlib \
16 --disable-shared \ 16 --without-headers \
17 --disable-threads \ 17 --disable-shared \
18 --disable-multilib \ 18 --disable-threads \
19 --disable-__cxa_atexit \ 19 --disable-multilib \
20 --enable-languages=c \ 20 --disable-__cxa_atexit \
21 ${OPTSPACE} \ 21 --enable-languages=c \
22 --program-prefix=${TARGET_PREFIX} \ 22 ${OPTSPACE} \
23 --with-sysroot=${STAGING_DIR_TARGET} \ 23 --program-prefix=${TARGET_PREFIX} \
24 --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \ 24 --with-sysroot=${STAGING_DIR_TARGET} \
25 ${EXTRA_OECONF_INITIAL} \ 25 --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \
26 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \ 26 ${EXTRA_OECONF_INITIAL} \
27 ${EXTRA_OECONF_FPU}" 27 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
28 ${EXTRA_OECONF_FPU} \
29"
28 30
29EXTRA_OECONF += " --with-native-system-header-dir=${SYSTEMHEADERS} " 31EXTRA_OECONF += "--with-native-system-header-dir=${SYSTEMHEADERS}"
30 32
31GCCCROSS_BUILDSYSROOT = "${B}/tmpsysroot" 33GCCCROSS_BUILDSYSROOT = "${B}/tmpsysroot"
32 34
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index cf3e5e891d..64d0652283 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -13,17 +13,23 @@ PN = "gcc-cross-${TARGET_ARCH}"
13 13
14require gcc-configure-common.inc 14require gcc-configure-common.inc
15 15
16EXTRA_OECONF += " --enable-poison-system-directories" 16EXTRA_OECONF += "--enable-poison-system-directories"
17EXTRA_OECONF_append_sh4 = " --with-multilib-list= --enable-incomplete-targets " 17EXTRA_OECONF_append_sh4 = " \
18 18 --with-multilib-list= \
19EXTRA_OECONF += "--disable-libunwind-exceptions \ 19 --enable-incomplete-targets \
20 --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ 20"
21 --with-system-zlib " 21
22 22EXTRA_OECONF += "\
23EXTRA_OECONF_PATHS = " \ 23 --disable-libunwind-exceptions \
24 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ 24 --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \
25 --with-sysroot=${STAGING_DIR_TARGET} \ 25 --with-system-zlib \
26 --with-build-sysroot=${STAGING_DIR_TARGET}" 26"
27
28EXTRA_OECONF_PATHS = "\
29 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \
30 --with-sysroot=${STAGING_DIR_TARGET} \
31 --with-build-sysroot=${STAGING_DIR_TARGET} \
32"
27 33
28ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" 34ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
29 35
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 974c80c4d8..e7d938d2e5 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -2,10 +2,11 @@ require gcc-configure-common.inc
2 2
3CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" 3CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
4 4
5EXTRA_OECONF_PATHS = " \ 5EXTRA_OECONF_PATHS = "\
6 --with-gxx-include-dir=${includedir}/c++/${BINV} \ 6 --with-gxx-include-dir=${includedir}/c++/${BINV} \
7 --with-sysroot=${STAGING_DIR_TARGET} \ 7 --with-sysroot=${STAGING_DIR_TARGET} \
8 --with-build-sysroot=${STAGING_DIR_TARGET}" 8 --with-build-sysroot=${STAGING_DIR_TARGET} \
9"
9 10
10EXTRA_OECONF += "--disable-libunwind-exceptions" 11EXTRA_OECONF += "--disable-libunwind-exceptions"
11EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" 12EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
@@ -63,111 +64,113 @@ PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
63BBCLASSEXTEND = "nativesdk" 64BBCLASSEXTEND = "nativesdk"
64 65
65PACKAGES = "\ 66PACKAGES = "\
66 ${PN}-dbg \ 67 ${PN}-dbg \
67 libstdc++ \ 68 libstdc++ \
68 libstdc++-precompile-dev \ 69 libstdc++-precompile-dev \
69 libstdc++-dev \ 70 libstdc++-dev \
70 libstdc++-staticdev \ 71 libstdc++-staticdev \
71 libg2c \ 72 libg2c \
72 libg2c-dev \ 73 libg2c-dev \
73 libssp \ 74 libssp \
74 libssp-dev \ 75 libssp-dev \
75 libssp-staticdev \ 76 libssp-staticdev \
76 libgfortran \ 77 libgfortran \
77 libgfortran-dev \ 78 libgfortran-dev \
78 libgfortran-staticdev \ 79 libgfortran-staticdev \
79 libmudflap \ 80 libmudflap \
80 libmudflap-dev \ 81 libmudflap-dev \
81 libmudflap-staticdev \ 82 libmudflap-staticdev \
82 libquadmath \ 83 libquadmath \
83 libquadmath-dev \ 84 libquadmath-dev \
84 libquadmath-staticdev \ 85 libquadmath-staticdev \
85 libgomp \ 86 libgomp \
86 libgomp-dev \ 87 libgomp-dev \
87 libgomp-staticdev \ 88 libgomp-staticdev \
88 libatomic \ 89 libatomic \
89 libatomic-dev \ 90 libatomic-dev \
90 libatomic-staticdev \ 91 libatomic-staticdev \
91" 92"
92# The base package doesn't exist, so we clear the recommends. 93# The base package doesn't exist, so we clear the recommends.
93RRECOMMENDS_${PN}-dbg = "" 94RRECOMMENDS_${PN}-dbg = ""
94 95
95# include python debugging scripts 96# include python debugging scripts
96FILES_${PN}-dbg += "\ 97FILES_${PN}-dbg += "\
97 ${libdir}/libstdc++.so.*-gdb.py \ 98 ${libdir}/libstdc++.so.*-gdb.py \
98 ${datadir}/gcc-${BINV}/python/libstdcxx" 99 ${datadir}/gcc-${BINV}/python/libstdcxx \
100"
99 101
100FILES_libg2c = "${target_libdir}/libg2c.so.*" 102FILES_libg2c = "${target_libdir}/libg2c.so.*"
101FILES_libg2c-dev = "\ 103FILES_libg2c-dev = "\
102 ${libdir}/libg2c.so \ 104 ${libdir}/libg2c.so \
103 ${libdir}/libg2c.a \ 105 ${libdir}/libg2c.a \
104 ${libdir}/libfrtbegin.a" 106 ${libdir}/libfrtbegin.a \
107"
105 108
106FILES_libstdc++ = "${libdir}/libstdc++.so.*" 109FILES_libstdc++ = "${libdir}/libstdc++.so.*"
107FILES_libstdc++-dev = "\ 110FILES_libstdc++-dev = "\
108 ${includedir}/c++/ \ 111 ${includedir}/c++/ \
109 ${libdir}/libstdc++.so \ 112 ${libdir}/libstdc++.so \
110 ${libdir}/libstdc++.la \ 113 ${libdir}/libstdc++.la \
111 ${libdir}/libsupc++.la" 114 ${libdir}/libsupc++.la \
115"
112FILES_libstdc++-staticdev = "\ 116FILES_libstdc++-staticdev = "\
113 ${libdir}/libstdc++.a \ 117 ${libdir}/libstdc++.a \
114 ${libdir}/libsupc++.a" 118 ${libdir}/libsupc++.a \
119"
115 120
116FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch" 121FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
117 122
118FILES_libssp = "${libdir}/libssp.so.*" 123FILES_libssp = "${libdir}/libssp.so.*"
119FILES_libssp-dev = " \ 124FILES_libssp-dev = "\
120 ${libdir}/libssp*.so \ 125 ${libdir}/libssp*.so \
121 ${libdir}/libssp*_nonshared.a \ 126 ${libdir}/libssp*_nonshared.a \
122 ${libdir}/libssp*.la \ 127 ${libdir}/libssp*.la \
123 ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ssp" 128 ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ssp \
124FILES_libssp-staticdev = " \ 129"
125 ${libdir}/libssp*.a" 130FILES_libssp-staticdev = "${libdir}/libssp*.a"
126 131
127FILES_libgfortran = "${libdir}/libgfortran.so.*" 132FILES_libgfortran = "${libdir}/libgfortran.so.*"
128FILES_libgfortran-dev = " \ 133FILES_libgfortran-dev = "\
129 ${libdir}/libgfortran*.so \ 134 ${libdir}/libgfortran*.so \
130 ${libdir}/libgfortran.spec \ 135 ${libdir}/libgfortran.spec \
131 ${libdir}/libgfortran.la \ 136 ${libdir}/libgfortran.la \
132 ${libdir}/gcc/${TARGET_SYS}/${BINV}/libgfortranbegin.* \ 137 ${libdir}/gcc/${TARGET_SYS}/${BINV}/libgfortranbegin.* \
133 ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single*" 138 ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single* \
134FILES_libgfortran-staticdev = " \ 139"
135 ${libdir}/libgfortran.a" 140FILES_libgfortran-staticdev = "${libdir}/libgfortran.a"
136 141
137INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev" 142INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev"
138 143
139FILES_libquadmath = "${libdir}/libquadmath*.so.*" 144FILES_libquadmath = "${libdir}/libquadmath*.so.*"
140FILES_libquadmath-dev = "\ 145FILES_libquadmath-dev = "\
141 ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/quadmath* \ 146 ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/quadmath* \
142 ${libdir}/libquadmath*.so \ 147 ${libdir}/libquadmath*.so \
143 ${libdir}/libquadmath.la" 148 ${libdir}/libquadmath.la \
144FILES_libquadmath-staticdev = "\ 149"
145 ${libdir}/libquadmath.a" 150FILES_libquadmath-staticdev = "${libdir}/libquadmath.a"
146 151
147FILES_libmudflap = "${libdir}/libmudflap*.so.*" 152FILES_libmudflap = "${libdir}/libmudflap*.so.*"
148FILES_libmudflap-dev = "\ 153FILES_libmudflap-dev = "\
149 ${libdir}/libmudflap*.so \ 154 ${libdir}/libmudflap*.so \
150 ${libdir}/libmudflap.la" 155 ${libdir}/libmudflap.la \
151FILES_libmudflap-staticdev = "\ 156"
152 ${libdir}/libmudflap.a" 157FILES_libmudflap-staticdev = "${libdir}/libmudflap.a"
153 158
154FILES_libgomp = "${libdir}/libgomp*${SOLIBS}" 159FILES_libgomp = "${libdir}/libgomp*${SOLIBS}"
155FILES_libgomp-dev = "\ 160FILES_libgomp-dev = "\
156 ${libdir}/libgomp*${SOLIBSDEV} \ 161 ${libdir}/libgomp*${SOLIBSDEV} \
157 ${libdir}/libgomp*.la \ 162 ${libdir}/libgomp*.la \
158 ${libdir}/libgomp.spec \ 163 ${libdir}/libgomp.spec \
159 ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/omp.h \ 164 ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/omp.h \
160 " 165"
161FILES_libgomp-staticdev = "\ 166FILES_libgomp-staticdev = "${libdir}/libgomp*.a"
162 ${libdir}/libgomp*.a \
163 "
164 167
165FILES_libatomic = "${libdir}/libatomic.so.*" 168FILES_libatomic = "${libdir}/libatomic.so.*"
166FILES_libatomic-dev = " \ 169FILES_libatomic-dev = "\
167 ${libdir}/libatomic.so \ 170 ${libdir}/libatomic.so \
168 ${libdir}/libatomic.la" 171 ${libdir}/libatomic.la \
169FILES_libatomic-staticdev = " \ 172"
170 ${libdir}/libatomic.a" 173FILES_libatomic-staticdev = "${libdir}/libatomic.a"
171 174
172do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" 175do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
173do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" 176do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index 59c554daf5..8941f5f3ed 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -1,105 +1,105 @@
1GCCMULTILIB = "--enable-multilib" 1GCCMULTILIB = "--enable-multilib"
2require gcc-configure-common.inc 2require gcc-configure-common.inc
3 3
4EXTRA_OECONF_PATHS = " \ 4EXTRA_OECONF_PATHS = "\
5 --with-sysroot=/ \ 5 --with-sysroot=/ \
6 --with-build-sysroot=${STAGING_DIR_TARGET} \ 6 --with-build-sysroot=${STAGING_DIR_TARGET} \
7 --with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \ 7 --with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \
8 --with-gxx-include-dir=${includedir}/c++/${BINV}" 8 --with-gxx-include-dir=${includedir}/c++/${BINV} \
9"
9 10
10EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" 11EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}"
11 12
12PACKAGES = "\ 13PACKAGES = "\
13 ${PN} ${PN}-plugins ${PN}-symlinks \ 14 ${PN} ${PN}-plugins ${PN}-symlinks \
14 g++ g++-symlinks \ 15 g++ g++-symlinks \
15 cpp cpp-symlinks \ 16 cpp cpp-symlinks \
16 g77 g77-symlinks \ 17 g77 g77-symlinks \
17 gfortran gfortran-symlinks \ 18 gfortran gfortran-symlinks \
18 gcov gcov-symlinks \ 19 gcov gcov-symlinks \
19 ${PN}-plugin-dev \ 20 ${PN}-plugin-dev \
20 ${PN}-doc \ 21 ${PN}-doc \
21 ${PN}-dev \ 22 ${PN}-dev \
22 ${PN}-dbg \ 23 ${PN}-dbg \
23" 24"
24 25
25FILES_${PN} = "\ 26FILES_${PN} = "\
26 ${bindir}/${TARGET_PREFIX}gcc* \ 27 ${bindir}/${TARGET_PREFIX}gcc* \
27 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \ 28 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
28 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \ 29 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \
29 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \ 30 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \
30 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ 31 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \
31 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto*${SOLIBSDEV} \ 32 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto*${SOLIBSDEV} \
32 ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ 33 ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
33 ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ 34 ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
34 ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ 35 ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \
35 ${gcclibdir}/${TARGET_SYS}/${BINV}/include \ 36 ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
36 ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \ 37 ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \
37" 38"
38INSANE_SKIP_${PN} += "dev-so" 39INSANE_SKIP_${PN} += "dev-so"
39 40
40FILES_${PN}-dbg += "\ 41FILES_${PN}-dbg += "\
41 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/.debug/ \ 42 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/.debug/ \
42 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/.debug/ \ 43 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/.debug/ \
43" 44"
44FILES_${PN}-dev = "\ 45FILES_${PN}-dev = "\
45 ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ 46 ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
46 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ 47 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
47" 48"
48FILES_${PN}-plugin-dev = "\ 49FILES_${PN}-plugin-dev = "\
49 ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \ 50 ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \
50 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \ 51 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \
51 ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \ 52 ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \
52" 53"
53FILES_${PN}-symlinks = "\ 54FILES_${PN}-symlinks = "\
54 ${bindir}/cc \ 55 ${bindir}/cc \
55 ${bindir}/gcc \ 56 ${bindir}/gcc \
56 ${bindir}/gccbug \ 57 ${bindir}/gccbug \
57" 58"
58 59
59FILES_${PN}-plugins = "\ 60FILES_${PN}-plugins = "\
60 ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \ 61 ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \
61" 62"
62ALLOW_EMPTY_${PN}-plugins = "1" 63ALLOW_EMPTY_${PN}-plugins = "1"
63 64
64FILES_g77 = "\ 65FILES_g77 = "\
65 ${bindir}/${TARGET_PREFIX}g77 \ 66 ${bindir}/${TARGET_PREFIX}g77 \
66 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ 67 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
67" 68"
68FILES_g77-symlinks = "\ 69FILES_g77-symlinks = "\
69 ${bindir}/g77 \ 70 ${bindir}/g77 \
70 ${bindir}/f77 \ 71 ${bindir}/f77 \
71" 72"
72FILES_gfortran = "\ 73FILES_gfortran = "\
73 ${bindir}/${TARGET_PREFIX}gfortran \ 74 ${bindir}/${TARGET_PREFIX}gfortran \
74 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \ 75 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \
75" 76"
76FILES_gfortran-symlinks = "\ 77FILES_gfortran-symlinks = "\
77 ${bindir}/gfortran \ 78 ${bindir}/gfortran \
78 ${bindir}/f95" 79 ${bindir}/f95"
79 80
80FILES_cpp = "\ 81FILES_cpp = "\
81 ${bindir}/${TARGET_PREFIX}cpp \ 82 ${bindir}/${TARGET_PREFIX}cpp \
82 ${base_libdir}/cpp \ 83 ${base_libdir}/cpp \
83 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1" 84 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
84FILES_cpp-symlinks = "${bindir}/cpp" 85FILES_cpp-symlinks = "${bindir}/cpp"
85 86
86FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" 87FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov"
87FILES_gcov-symlinks = "${bindir}/gcov" 88FILES_gcov-symlinks = "${bindir}/gcov"
88 89
89FILES_g++ = "\ 90FILES_g++ = "\
90 ${bindir}/${TARGET_PREFIX}g++ \ 91 ${bindir}/${TARGET_PREFIX}g++ \
91 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ 92 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
92" 93"
93FILES_g++-symlinks = "\ 94FILES_g++-symlinks = "\
94 ${bindir}/c++ \ 95 ${bindir}/c++ \
95 ${bindir}/g++ \ 96 ${bindir}/g++ \
96" 97"
97 98
98
99FILES_${PN}-doc = "\ 99FILES_${PN}-doc = "\
100 ${infodir} \ 100 ${infodir} \
101 ${mandir} \ 101 ${mandir} \
102 ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ 102 ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
103" 103"
104 104
105do_compile () { 105do_compile () {
diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc
index 45dd151e5f..22c42d5eca 100644
--- a/meta/recipes-devtools/gcc/libgcc.inc
+++ b/meta/recipes-devtools/gcc/libgcc.inc
@@ -3,25 +3,26 @@ require libgcc-common.inc
3DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" 3DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
4 4
5PACKAGES = "\ 5PACKAGES = "\
6 ${PN} \ 6 ${PN} \
7 ${PN}-dev \ 7 ${PN}-dev \
8 ${PN}-dbg \ 8 ${PN}-dbg \
9 libgcov-dev \ 9 libgcov-dev \
10 " 10"
11 11
12FILES_${PN} = "${base_libdir}/libgcc*.so.*" 12FILES_${PN} = "${base_libdir}/libgcc*.so.*"
13FILES_${PN}-dev = " \ 13FILES_${PN}-dev = "\
14 ${base_libdir}/libgcc*.so \ 14 ${base_libdir}/libgcc*.so \
15 ${libdir}/${TARGET_SYS}/${BINV}/*crt* \ 15 ${libdir}/${TARGET_SYS}/${BINV}/*crt* \
16 ${libdir}/${TARGET_SYS}/${BINV}/64 \ 16 ${libdir}/${TARGET_SYS}/${BINV}/64 \
17 ${libdir}/${TARGET_SYS}/${BINV}/32 \ 17 ${libdir}/${TARGET_SYS}/${BINV}/32 \
18 ${libdir}/${TARGET_SYS}/${BINV}/x32 \ 18 ${libdir}/${TARGET_SYS}/${BINV}/x32 \
19 ${libdir}/${TARGET_SYS}/${BINV}/n32 \ 19 ${libdir}/${TARGET_SYS}/${BINV}/n32 \
20 ${libdir}/${TARGET_SYS}/${BINV}/libgcc* \ 20 ${libdir}/${TARGET_SYS}/${BINV}/libgcc* \
21 ${@base_conditional('TARGET_SYS_NO_EXTENSION', '${TARGET_SYS}', '', '${libdir}/${TARGET_SYS_NO_EXTENSION}', d)}" 21 ${@base_conditional('TARGET_SYS_NO_EXTENSION', '${TARGET_SYS}', '', '${libdir}/${TARGET_SYS_NO_EXTENSION}', d)} \
22FILES_libgcov-dev = " \ 22"
23 ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ 23FILES_libgcov-dev = "\
24 " 24 ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
25"
25FILES_${PN}-dbg += "${base_libdir}/.debug/" 26FILES_${PN}-dbg += "${base_libdir}/.debug/"
26 27
27LIBGCCBUILDTREENAME = "gcc-build-internal-" 28LIBGCCBUILDTREENAME = "gcc-build-internal-"
diff --git a/meta/recipes-devtools/gcc/libgfortran.inc b/meta/recipes-devtools/gcc/libgfortran.inc
index 7bf412134b..cf7942f41d 100644
--- a/meta/recipes-devtools/gcc/libgfortran.inc
+++ b/meta/recipes-devtools/gcc/libgfortran.inc
@@ -1,8 +1,9 @@
1require gcc-configure-common.inc 1require gcc-configure-common.inc
2 2
3EXTRA_OECONF_PATHS = " \ 3EXTRA_OECONF_PATHS = "\
4 --with-sysroot=${STAGING_DIR_TARGET} \ 4 --with-sysroot=${STAGING_DIR_TARGET} \
5 --with-build-sysroot=${STAGING_DIR_TARGET}" 5 --with-build-sysroot=${STAGING_DIR_TARGET} \
6"
6 7
7do_configure () { 8do_configure () {
8 mtarget=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` 9 mtarget=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
@@ -45,20 +46,20 @@ DEPENDS = "gcc-runtime"
45BBCLASSEXTEND = "nativesdk" 46BBCLASSEXTEND = "nativesdk"
46 47
47PACKAGES = "\ 48PACKAGES = "\
48 ${PN}-dbg \ 49 ${PN}-dbg \
49 libgfortran \ 50 libgfortran \
50 libgfortran-dev \ 51 libgfortran-dev \
51 libgfortran-staticdev \ 52 libgfortran-staticdev \
52" 53"
53FILES_${PN} = "${libdir}/libgfortran.so.*" 54FILES_${PN} = "${libdir}/libgfortran.so.*"
54FILES_${PN}-dev = " \ 55FILES_${PN}-dev = "\
55 ${libdir}/libgfortran*.so \ 56 ${libdir}/libgfortran*.so \
56 ${libdir}/libgfortran.spec \ 57 ${libdir}/libgfortran.spec \
57 ${libdir}/libgfortran.la \ 58 ${libdir}/libgfortran.la \
58 ${libdir}/gcc/${TARGET_SYS}/${BINV}/libgfortranbegin.* \ 59 ${libdir}/gcc/${TARGET_SYS}/${BINV}/libgfortranbegin.* \
59 ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single*" 60 ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single* \
60FILES_${PN}-staticdev = " \ 61"
61 ${libdir}/libgfortran.a" 62FILES_${PN}-staticdev = "${libdir}/libgfortran.a"
62 63
63INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev" 64INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev"
64 65
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 10:38:34 +0000