diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-30 14:23:37 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-02 15:15:51 +0100 |
| commit | 0ea63b6a439fe97f840c69d08cf381687baaae3f (patch) | |
| tree | c632ba15d6b67617859f335fe9263930cbf1a0fa /meta/recipes-devtools/pkgconf | |
| parent | 3288587aeb009fb65652776242c0a526b90771e2 (diff) | |
| download | poky-0ea63b6a439fe97f840c69d08cf381687baaae3f.tar.gz | |
recipes: Update WORKDIR references to UNPACKDIR
Since we want to be able to stop unpacking to WORKDIR, correct the WORKDIR
references in recipe do_compile/do_install tasks to use UNPACKDIR in the
appropraite places instead.
(From OE-Core rev: d73595df69667fe9d12ecd407b77a0b8dae2109c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pkgconf')
| -rw-r--r-- | meta/recipes-devtools/pkgconf/pkgconf_2.2.0.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/pkgconf/pkgconf_2.2.0.bb b/meta/recipes-devtools/pkgconf/pkgconf_2.2.0.bb index e98458ea55..5f4ef73d43 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_2.2.0.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_2.2.0.bb | |||
| @@ -29,18 +29,18 @@ EXTRA_OECONF += "--with-pkg-config-dir='${libdir}/pkgconfig:${datadir}/pkgconfig | |||
| 29 | do_install:append () { | 29 | do_install:append () { |
| 30 | # Install a wrapper which deals, as much as possible with pkgconf vs | 30 | # Install a wrapper which deals, as much as possible with pkgconf vs |
| 31 | # pkg-config compatibility issues. | 31 | # pkg-config compatibility issues. |
| 32 | install -m 0755 "${WORKDIR}/pkg-config-wrapper" "${D}${bindir}/pkg-config" | 32 | install -m 0755 "${UNPACKDIR}/pkg-config-wrapper" "${D}${bindir}/pkg-config" |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | do_install:append:class-native () { | 35 | do_install:append:class-native () { |
| 36 | # Install a pkg-config-native wrapper that will use the native sysroot instead | 36 | # Install a pkg-config-native wrapper that will use the native sysroot instead |
| 37 | # of the MACHINE sysroot, for using pkg-config when building native tools. | 37 | # of the MACHINE sysroot, for using pkg-config when building native tools. |
| 38 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ | 38 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ |
| 39 | < ${WORKDIR}/pkg-config-native.in > ${B}/pkg-config-native | 39 | < ${UNPACKDIR}/pkg-config-native.in > ${B}/pkg-config-native |
| 40 | install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native | 40 | install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native |
| 41 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ | 41 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ |
| 42 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ | 42 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ |
| 43 | < ${WORKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk | 43 | < ${UNPACKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk |
| 44 | install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk | 44 | install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk |
| 45 | } | 45 | } |
| 46 | 46 | ||
