[packages] alsalib: remove kernel 2.4 reference and fix ccache build issue

git-svn-id: svn://svn.openwrt.org/openwrt/packages@32138 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile
index c3e938a..e60d46d 100644 (file)
--- a/libs/alsa-lib/Makefile
+++ b/libs/alsa-lib/Makefile
@@ -16,23 +16,17 @@ PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
                http://alsa.cybermirror.org/lib/
 PKG_MD5SUM:=7cc05f25e1d5b65da8fb3fdcd540f226
 
-PKG_FIXUP:=libtool
+PKG_FIXUP:=autoreconf libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-ifeq ($(KERNEL),2.4)
-DEPENDS_KMOD:=+kmod-alsa
-else
-DEPENDS_KMOD:=+kmod-sound-core
-endif
-
 define Package/alsa-lib
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=ALSA (Advanced Linux Sound Architecture) library
   URL:=http://www.alsa-project.org/
-  DEPENDS:=@AUDIO_SUPPORT $(DEPENDS_KMOD)
+  DEPENDS:=@AUDIO_SUPPORT +kmod-sound-core
 endef
 
 define Package/alsa-lib/description
@@ -44,7 +38,7 @@ TARGET_CFLAGS += $(FPIC)
 
 define Build/Configure
        $(call Build/Configure/Default, \
-           --enable-static \
+               --enable-static \
                --disable-python \
                --disable-debug \
                --without-debug \

diff --git a/libs/alsa-lib/patches/004-ccache.patch b/libs/alsa-lib/patches/004-ccache.patch
new file mode 100644 (file)
index 0000000..e71a1e8
--- /dev/null
+++ b/libs/alsa-lib/patches/004-ccache.patch
@@ -0,0 +1,27 @@
+Index: alsa-lib-1.0.24.1/configure.in
+===================================================================
+--- alsa-lib-1.0.24.1.orig/configure.in        2011-01-31 15:18:50.000000000 +0100
++++ alsa-lib-1.0.24.1/configure.in     2012-06-09 15:57:42.600834238 +0200
+@@ -22,22 +22,6 @@
+ 
+ AC_PREFIX_DEFAULT(/usr)
+ 
+-dnl Checks for programs.
+-
+-dnl try to gues cross-compiler if not set
+-if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`";
+-then
+-  AC_MSG_CHECKING(for cross-compiler)
+-
+-  which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
+-  which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \
+-  && CC=${host_cpu}-${host-os}-gcc
+-  which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \
+-  && CC=${host_cpu}-${host_vendor}-${host_os}-gcc
+-
+-  AC_MSG_RESULT($CC)
+-fi
+-          
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+ 
+