summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--package/alsa-lib/alsa-lib.mk2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 0da2d77cc..db7b233ed 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,10 @@
cjson, directfb, gdb, hiawatha, lcdproc, libdaemon, libecore,
libhid, libpcap, libusb, linux-fusion, ocf-linux, strace,
+ Issues resolved (http://bugs.uclibc.org):
+
+ #5732: Error : package/alsa-lib/alsa-lib.mk
+
2012.11-rc1, Released November 17th, 2012
Fixes all over the tree and new features.
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index daa551d39..eddd3d2f3 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -17,7 +17,7 @@ ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVD
--without-versioned
# Can't build with static & shared at the same time (1.0.25+)
-ifeq ($(BR2_PREFER_STATIC),y)
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
ALSA_LIB_CONF_OPT += --enable-shared=no
else
ALSA_LIB_CONF_OPT += --enable-static=no