Commit 0875bc85 authored by Daniel Laird's avatar Daniel Laird
Browse files

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: default avatarDaniel Laird <daniel.j.laird@nxp.com>
parent 2c6ee829

package/gettext/gettext.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

package/multimedia/alsa-utils/alsa-utils.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)