diff options
Diffstat (limited to 'meta/recipes-devtools/pkgconf')
-rw-r--r-- | meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb (renamed from meta/recipes-devtools/pkgconf/pkgconf_2.1.1.bb) | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in index 9ed30a0d80..0d736fe4d4 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in +++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in | |||
@@ -1,6 +1,6 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | 2 | ||
3 | PKG_CONFIG_PATH="@PATH_NATIVE@" | 3 | PKG_CONFIG_PATH="@PATH_NATIVE@$EXTRA_NATIVE_PKGCONFIG_PATH" |
4 | unset PKG_CONFIG_SYSROOT_DIR | 4 | unset PKG_CONFIG_SYSROOT_DIR |
5 | 5 | ||
6 | pkg-config "$@" | 6 | pkg-config "$@" |
diff --git a/meta/recipes-devtools/pkgconf/pkgconf_2.1.1.bb b/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb index 33d69451bb..12ca075b5d 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_2.1.1.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "\ | |||
20 | file://pkg-config-native.in \ | 20 | file://pkg-config-native.in \ |
21 | file://pkg-config-esdk.in \ | 21 | file://pkg-config-esdk.in \ |
22 | " | 22 | " |
23 | SRC_URI[sha256sum] = "3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5" | 23 | SRC_URI[sha256sum] = "cd05c9589b9f86ecf044c10a2269822bc9eb001eced2582cfffd658b0a50c243" |
24 | 24 | ||
25 | inherit autotools | 25 | inherit autotools |
26 | 26 | ||
@@ -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 | ||