diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-06-10 13:40:27 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-06-10 13:40:27 +0200 |
| commit | 0399441c0781eb912d6c375533fd60c69573809e (patch) | |
| tree | 3e1d3a4310a9a990273dca40ef68d6df828ffbb7 /recipes/pkgconfig | |
| parent | aa45c16c5c2bee16f5827f269bb305b00c266972 (diff) | |
| parent | 4edd8b112d7b6ff108eda52db600861d90f5cf8d (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/pkgconfig')
| -rw-r--r-- | recipes/pkgconfig/pkgconfig-native_0.23.bb | 2 | ||||
| -rw-r--r-- | recipes/pkgconfig/pkgconfig-sdk_0.23.bb | 2 | ||||
| -rw-r--r-- | recipes/pkgconfig/pkgconfig.inc | 2 | ||||
| -rw-r--r-- | recipes/pkgconfig/pkgconfig_0.23.bb | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/recipes/pkgconfig/pkgconfig-native_0.23.bb b/recipes/pkgconfig/pkgconfig-native_0.23.bb index 24497a9866..da728d3c22 100644 --- a/recipes/pkgconfig/pkgconfig-native_0.23.bb +++ b/recipes/pkgconfig/pkgconfig-native_0.23.bb @@ -1,6 +1,8 @@ require pkgconfig.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}" +PR = "${INC_PR}.1" + S = "${WORKDIR}/pkg-config-${PV}/" inherit native DEPENDS = "" diff --git a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb index 3b20371777..47a5b46f0a 100644 --- a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb +++ b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb @@ -1,6 +1,8 @@ require pkgconfig.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}" +PR = "${INC_PR}.1" + S = "${WORKDIR}/pkg-config-${PV}/" inherit sdk DEPENDS = "" diff --git a/recipes/pkgconfig/pkgconfig.inc b/recipes/pkgconfig/pkgconfig.inc index 939199bc37..495403eaf5 100644 --- a/recipes/pkgconfig/pkgconfig.inc +++ b/recipes/pkgconfig/pkgconfig.inc @@ -5,7 +5,7 @@ It replaces the ubiquitous *-config scripts you may have \ seen with a single tool." HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/" LICENSE = "GPL" -PR = "r7" +INC_PR = "r7" SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ diff --git a/recipes/pkgconfig/pkgconfig_0.23.bb b/recipes/pkgconfig/pkgconfig_0.23.bb index 10ce0fc9c3..8e75adc6cf 100644 --- a/recipes/pkgconfig/pkgconfig_0.23.bb +++ b/recipes/pkgconfig/pkgconfig_0.23.bb @@ -1,4 +1,6 @@ require pkgconfig.inc +PR = "${INC_PR}.1" + DEPENDS += "glib-2.0" EXTRA_OECONF = "--with-installed-glib" |