diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-14 21:01:16 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-14 21:01:16 +0000 |
| commit | 565e05c8a18ecb7ffff0018b598218d32399d8b7 (patch) | |
| tree | a49e24c47e431bcb1de31bb6bd350bec74b7a457 /package/java | |
| parent | 43f18ea31c3447da516bfad8d81c6490a93d9411 (diff) | |
packages: fix pkgconfig depencies and select pkgconfig where needed
Diffstat (limited to 'package/java')
| -rw-r--r-- | package/java/classpath/Config.in | 1 | ||||
| -rw-r--r-- | package/java/classpath/classpath.mk | 2 | ||||
| -rw-r--r-- | package/java/jamvm/Config.in | 2 | ||||
| -rw-r--r-- | package/java/jamvm/jamvm.mk | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/package/java/classpath/Config.in b/package/java/classpath/Config.in index efd6e0b7f..15ea83360 100644 --- a/package/java/classpath/Config.in +++ b/package/java/classpath/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_CLASSPATH bool "classpath" + select BR2_PACKAGE_PKGCONFIG default n help diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk index cd9cc3565..0e0eaa3da 100644 --- a/package/java/classpath/classpath.mk +++ b/package/java/classpath/classpath.mk @@ -58,7 +58,7 @@ CLASSPATH_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ --disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ --disable-gconf-peer --disable-examples --disable-plugin -CLASSPATH_DEPENDENCIES = uclibc png jpeg tiff +CLASSPATH_DEPENDENCIES = uclibc pkgconfig png jpeg tiff ifeq ($(BR2_PACKAGE_ALSA_LIB),y) CLASSPATH_DEPENDENCIES+= alsa-lib diff --git a/package/java/jamvm/Config.in b/package/java/jamvm/Config.in index 53673c9e6..2f2ddd787 100644 --- a/package/java/jamvm/Config.in +++ b/package/java/jamvm/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_JAMVM bool "jamvm" default n depends on BR2_PACKAGE_CLASSPATH - + select BR2_PACKAGE_PKGCONFIG help JamVM is a new Java Virtual Machine which conforms to the JVM specification version 2 (blue book). diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk index 0cb015760..951d091d8 100644 --- a/package/java/jamvm/jamvm.mk +++ b/package/java/jamvm/jamvm.mk @@ -57,7 +57,7 @@ JAMVM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ --with-classpath-install-dir=/usr \ -JAMVM_DEPENDENCIES = uclibc classpath +JAMVM_DEPENDENCIES = uclibc pkgconfig classpath #Include X libraries when we have an X server ifneq ($(BR2_PACKAGE_XSERVER_none),y) |