diff options
| author | Lukas Elsner <open@mindrunner.de> | 2014-11-03 11:37:41 +1000 |
|---|---|---|
| committer | Lukas Elsner <open@mindrunner.de> | 2014-11-03 11:37:41 +1000 |
| commit | 6c164718856e63c8ddad539528792ce16b177d33 (patch) | |
| tree | 32796cc067ca7a14088224c2a4613ecdeb6d8c08 /recipes-core/openjdk/openjdk-common.inc | |
| parent | d2b75b615e4612f9fa05950c1d76d4a719e573d4 (diff) | |
| parent | d031686fedd1f88fb628a8a87916477208377146 (diff) | |
| download | meta-java-6c164718856e63c8ddad539528792ce16b177d33.tar.gz | |
Merge remote-tracking branch 'woglinde/dora' into test
Conflicts:
recipes-core/cacao/cacao_1.6.1.bb
Diffstat (limited to 'recipes-core/openjdk/openjdk-common.inc')
| -rw-r--r-- | recipes-core/openjdk/openjdk-common.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc index 9c746de..349ce9e 100644 --- a/recipes-core/openjdk/openjdk-common.inc +++ b/recipes-core/openjdk/openjdk-common.inc | |||
| @@ -17,7 +17,7 @@ DEPENDS_append_libc-uclibc = " virtual/libiconv " | |||
| 17 | # because structure sizes and/or alignment may differ. | 17 | # because structure sizes and/or alignment may differ. |
| 18 | DEPENDS_append = " qemu-native " | 18 | DEPENDS_append = " qemu-native " |
| 19 | 19 | ||
| 20 | inherit java autotools gettext qemu | 20 | inherit java autotools gettext qemu pkgconfig |
| 21 | 21 | ||
| 22 | # OpenJDK uses slightly different names for certain arches. We need to know | 22 | # OpenJDK uses slightly different names for certain arches. We need to know |
| 23 | # this to create some files which are expected by the build. | 23 | # this to create some files which are expected by the build. |