diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/libtool | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool')
5 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc index e9225e140c..c1cbceb51f 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc | |||
@@ -28,7 +28,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ | |||
28 | SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" | 28 | SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" |
29 | SRC_URI[sha256sum] = "e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3" | 29 | SRC_URI[sha256sum] = "e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3" |
30 | 30 | ||
31 | do_compile_prepend () { | 31 | do_compile:prepend () { |
32 | # Sometimes this file doesn't get rebuilt, force the issue | 32 | # Sometimes this file doesn't get rebuilt, force the issue |
33 | rm -f ${S}/build-aux/ltmain.sh | 33 | rm -f ${S}/build-aux/ltmain.sh |
34 | make build-aux/ltmain.sh | 34 | make build-aux/ltmain.sh |
@@ -43,9 +43,9 @@ CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep" | |||
43 | DEPENDS = "libtool-native" | 43 | DEPENDS = "libtool-native" |
44 | 44 | ||
45 | PACKAGES =+ "libltdl" | 45 | PACKAGES =+ "libltdl" |
46 | FILES_${PN} += "${datadir}/aclocal" | 46 | FILES:${PN} += "${datadir}/aclocal" |
47 | 47 | ||
48 | FILES_${PN}-dev_remove = "${datadir}/aclocal" | 48 | FILES:${PN}-dev:remove = "${datadir}/aclocal" |
49 | FILES_libltdl = "${libdir}/libltdl${SOLIBS}" | 49 | FILES:libltdl = "${libdir}/libltdl${SOLIBS}" |
50 | 50 | ||
51 | export CONFIG_SHELL="/bin/bash" | 51 | export CONFIG_SHELL="/bin/bash" |
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb index 02c6e152fc..4a43867b3e 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb | |||
@@ -8,7 +8,7 @@ datadir = "${STAGING_DIR_TARGET}${target_datadir}" | |||
8 | 8 | ||
9 | inherit nopackages | 9 | inherit nopackages |
10 | 10 | ||
11 | do_configure_prepend () { | 11 | do_configure:prepend () { |
12 | # Remove any existing libtool m4 since old stale versions would break | 12 | # Remove any existing libtool m4 since old stale versions would break |
13 | # any upgrade | 13 | # any upgrade |
14 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 | 14 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 |
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb index 4c5218ade0..3b20ce3e69 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb | |||
@@ -8,7 +8,7 @@ inherit native | |||
8 | 8 | ||
9 | EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}" | 9 | EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}" |
10 | 10 | ||
11 | do_configure_prepend () { | 11 | do_configure:prepend () { |
12 | # Remove any existing libtool m4 since old stale versions would break | 12 | # Remove any existing libtool m4 since old stale versions would break |
13 | # any upgrade | 13 | # any upgrade |
14 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 | 14 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 |
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.6.bb b/meta/recipes-devtools/libtool/libtool_2.4.6.bb index a5715faaa9..95bbc875f0 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.6.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.6.bb | |||
@@ -2,7 +2,7 @@ require libtool-${PV}.inc | |||
2 | 2 | ||
3 | SRC_URI += "file://multilib.patch file://debian-no_hostname.patch" | 3 | SRC_URI += "file://multilib.patch file://debian-no_hostname.patch" |
4 | 4 | ||
5 | RDEPENDS_${PN} += "bash" | 5 | RDEPENDS:${PN} += "bash" |
6 | 6 | ||
7 | # | 7 | # |
8 | # We want the results of libtool-cross preserved - don't stage anything ourselves. | 8 | # We want the results of libtool-cross preserved - don't stage anything ourselves. |
@@ -13,9 +13,9 @@ SYSROOT_DIRS_BLACKLIST += " \ | |||
13 | ${datadir}/libtool/build-aux \ | 13 | ${datadir}/libtool/build-aux \ |
14 | " | 14 | " |
15 | 15 | ||
16 | ACLOCALEXTRAPATH_class-target = "" | 16 | ACLOCALEXTRAPATH:class-target = "" |
17 | 17 | ||
18 | do_install_append () { | 18 | do_install:append () { |
19 | sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \ | 19 | sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \ |
20 | -e "s@${DEBUG_PREFIX_MAP}@@g" \ | 20 | -e "s@${DEBUG_PREFIX_MAP}@@g" \ |
21 | -e 's@${STAGING_DIR_HOST}@@g' \ | 21 | -e 's@${STAGING_DIR_HOST}@@g' \ |
diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb index 508eade326..e3ad6721fd 100644 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb +++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb | |||
@@ -8,9 +8,9 @@ SRC_URI += "file://fixinstall.patch" | |||
8 | inherit nativesdk | 8 | inherit nativesdk |
9 | 9 | ||
10 | S = "${WORKDIR}/libtool-${PV}" | 10 | S = "${WORKDIR}/libtool-${PV}" |
11 | FILES_${PN} += "${datadir}/libtool/*" | 11 | FILES:${PN} += "${datadir}/libtool/*" |
12 | 12 | ||
13 | do_configure_prepend () { | 13 | do_configure:prepend () { |
14 | # Remove any existing libtool m4 since old stale versions would break | 14 | # Remove any existing libtool m4 since old stale versions would break |
15 | # any upgrade | 15 | # any upgrade |
16 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 | 16 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 |