diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2025-06-16 11:50:00 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-20 12:07:27 +0100 |
| commit | dc9faa3cdc057983b55fb6bd19091722c58bc62c (patch) | |
| tree | 71d3e00e269779049376fc64ca9fa7c10b5b9707 /meta/recipes-devtools/gcc | |
| parent | 0ad5fb3431b5f5875326d929442124a8fabe0642 (diff) | |
| download | poky-dc9faa3cdc057983b55fb6bd19091722c58bc62c.tar.gz | |
meta: remove consecutive blank lines
Some of them were introduced by mass-removal of S = WORKDIR/git assignments;
rather than try to fix up (or redo) just these, I've run this sed command over
the whole tree:
sed -i -z -E 's/([ \t\f\v\r]*\n){3,}/\n\n/g' `find . -name *.bb -o -name *.inc`
The rationale is that more than one empty line is wasting vertical screen space, and
does nothing for readability.
(From OE-Core rev: cedc4ff7c9bcfb22a20e43e47f9759f4007a4f1a)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-common.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-canadian_15.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-multilib-config.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/libgcc-common.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/libgcc.inc | 1 |
6 files changed, 0 insertions, 9 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index e3fb48c030..50ff0d2e82 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc | |||
| @@ -116,6 +116,5 @@ do_configure () { | |||
| 116 | export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" | 116 | export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" |
| 117 | export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" | 117 | export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" |
| 118 | 118 | ||
| 119 | |||
| 120 | oe_runconf | 119 | oe_runconf |
| 121 | } | 120 | } |
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_15.1.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_15.1.bb index bf53c5cd78..355757c656 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_15.1.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_15.1.bb | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | require recipes-devtools/gcc/gcc-${PV}.inc | 1 | require recipes-devtools/gcc/gcc-${PV}.inc |
| 2 | require gcc-cross-canadian.inc | 2 | require gcc-cross-canadian.inc |
| 3 | 3 | ||
| 4 | |||
| 5 | |||
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 54a1d3d85c..80b85fb054 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc | |||
| @@ -44,7 +44,6 @@ EXTRA_OECONF_PATHS = "\ | |||
| 44 | 44 | ||
| 45 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" | 45 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" |
| 46 | 46 | ||
| 47 | |||
| 48 | do_configure:prepend () { | 47 | do_configure:prepend () { |
| 49 | install -d ${RECIPE_SYSROOT}${target_includedir} | 48 | install -d ${RECIPE_SYSROOT}${target_includedir} |
| 50 | touch ${RECIPE_SYSROOT}${target_includedir}/limits.h | 49 | touch ${RECIPE_SYSROOT}${target_includedir}/limits.h |
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc index 1a4169f91a..2afd8f6f2a 100644 --- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc +++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc | |||
| @@ -59,7 +59,6 @@ python gcc_multilib_setup() { | |||
| 59 | if ('%sgcc' % mlprefix) != pn and (not pn.startswith('gcc-cross-canadian')) and pn != "nativesdk-gcc": | 59 | if ('%sgcc' % mlprefix) != pn and (not pn.startswith('gcc-cross-canadian')) and pn != "nativesdk-gcc": |
| 60 | return | 60 | return |
| 61 | 61 | ||
| 62 | |||
| 63 | def write_config(root, files, options, dirnames, osdirnames): | 62 | def write_config(root, files, options, dirnames, osdirnames): |
| 64 | for ml_conf_file in files: | 63 | for ml_conf_file in files: |
| 65 | with open(root + '/' + ml_conf_file, 'r') as f: | 64 | with open(root + '/' + ml_conf_file, 'r') as f: |
| @@ -142,7 +141,6 @@ python gcc_multilib_setup() { | |||
| 142 | with open(root + '/' + ml_conf_file, 'w') as f: | 141 | with open(root + '/' + ml_conf_file, 'w') as f: |
| 143 | f.write(''.join(filelines)) | 142 | f.write(''.join(filelines)) |
| 144 | 143 | ||
| 145 | |||
| 146 | gcc_target_config_files = { | 144 | gcc_target_config_files = { |
| 147 | 'x86_64' : ['gcc/config/i386/t-linux64'], | 145 | 'x86_64' : ['gcc/config/i386/t-linux64'], |
| 148 | 'i586' : ['gcc/config/i386/t-linux64'], | 146 | 'i586' : ['gcc/config/i386/t-linux64'], |
| @@ -176,7 +174,6 @@ python gcc_multilib_setup() { | |||
| 176 | libdirx32 = 'SYSTEMLIBS_DIR' | 174 | libdirx32 = 'SYSTEMLIBS_DIR' |
| 177 | libdirn32 = 'SYSTEMLIBS_DIR' | 175 | libdirn32 = 'SYSTEMLIBS_DIR' |
| 178 | 176 | ||
| 179 | |||
| 180 | target_arch = (d.getVar('TARGET_ARCH_MULTILIB_ORIGINAL') if mlprefix | 177 | target_arch = (d.getVar('TARGET_ARCH_MULTILIB_ORIGINAL') if mlprefix |
| 181 | else d.getVar('TARGET_ARCH')) | 178 | else d.getVar('TARGET_ARCH')) |
| 182 | if pn == "nativesdk-gcc": | 179 | if pn == "nativesdk-gcc": |
diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index e3db17d700..65bcd24bc7 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc | |||
| @@ -104,7 +104,6 @@ fakeroot python do_multilib_install() { | |||
| 104 | os.symlink(src, dest) | 104 | os.symlink(src, dest) |
| 105 | return | 105 | return |
| 106 | 106 | ||
| 107 | |||
| 108 | for ml in multilibs.split(): | 107 | for ml in multilibs.split(): |
| 109 | tune = d.getVar('DEFAULTTUNE:virtclass-multilib-' + ml) | 108 | tune = d.getVar('DEFAULTTUNE:virtclass-multilib-' + ml) |
| 110 | if not tune: | 109 | if not tune: |
diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc index 9554475382..a3f0f947f7 100644 --- a/meta/recipes-devtools/gcc/libgcc.inc +++ b/meta/recipes-devtools/gcc/libgcc.inc | |||
| @@ -36,7 +36,6 @@ LICENSE:${PN} = "GPL-3.0-with-GCC-exception" | |||
| 36 | LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception" | 36 | LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception" |
| 37 | LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception" | 37 | LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception" |
| 38 | 38 | ||
| 39 | |||
| 40 | FILES:${PN}-dev = "\ | 39 | FILES:${PN}-dev = "\ |
| 41 | ${base_libdir}/libgcc*.so \ | 40 | ${base_libdir}/libgcc*.so \ |
| 42 | ${@oe.utils.conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \ | 41 | ${@oe.utils.conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \ |
