diff options
| author | Daniel Laird <danieljlaird@hotmail.com> | 2009-01-13 10:26:28 +0000 |
|---|---|---|
| committer | Daniel Laird <danieljlaird@hotmail.com> | 2009-01-13 10:26:28 +0000 |
| commit | 0875bc85bbe33d542e9045e931d223812c3eca44 (patch) | |
| tree | 0c068cadd1621ca54149700bc29ad1732a6ea083 | |
| parent | 2c6ee8299b5d92a3efa9b614155399d9efa58c0f (diff) | |
| download | buildroot-novena-0875bc85bbe33d542e9045e931d223812c3eca44.tar.gz buildroot-novena-0875bc85bbe33d542e9045e931d223812c3eca44.zip | |
package/alsa-lib/alsa-lib.mk
package/gettext/gettext.mk: Both of these components look for iconv when configuring so need to be dependent.
Both of these packages can be built with libiconv support. If libiconv is enabled and these are built first
then some configure variables get stored in the system cache and then libiconv is not used properly.
If libiconv is selected by user make sure it is built before either of these packages are built.
Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
| -rw-r--r-- | package/gettext/gettext.mk | 2 | ||||
| -rw-r--r-- | package/multimedia/alsa-utils/alsa-utils.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 2232d64bc..dd7f75a3a 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -120,7 +120,7 @@ $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY): $(GETTEXT_DIR)/$(GETTEXT_BINARY) autopoint envsubst gettext.sh gettextize msg* ?gettext) touch -c $@ -gettext: uclibc pkgconfig $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) +gettext: uclibc pkgconfig $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) gettext-unpacked: $(GETTEXT_DIR)/.unpacked diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk index 3a54d1bf4..6e99d041a 100644 --- a/package/multimedia/alsa-utils/alsa-utils.mk +++ b/package/multimedia/alsa-utils/alsa-utils.mk @@ -71,7 +71,7 @@ $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY fi touch -c $@ -alsa-utils: uclibc alsa-lib ncurses $(if $(BR2_PACKAGE_LIBINTL),libintl) $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY) +alsa-utils: uclibc alsa-lib ncurses $(if $(BR2_PACKAGE_LIBINTL),libintl) $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY) alsa-utils-source: $(DL_DIR)/$(ALSA_UTILS_SOURCE) |