different make bulkallmod fixes

12 files changed, 94 insertions, 13 deletions

diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index c9b404fe2..db3a9f115 100644
--- a/package/DirectFB/Makefile
+++ b/package/DirectFB/Makefile
@@ -38,10 +38,9 @@ CONFIGURE_ARGS+=	--with-inputdrivers=linuxinput,keyboard,ps2mouse \
 # This is to overcome libtool fuckup - when building without,
 # libtool calls (the correct) ld directly without parameters,
 # which then chooses the wrong default emulation (which is
-# probably the real problem here). LDEMULATION overrides ld's
-# wrong choice.
+# probably the real problem here).
 ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
-XAKE_FLAGS+=		LDEMULATION=elf64ltsmip
+XAKE_FLAGS+=		LDFLAGS=$(ADK_TARGET_ABI_CFLAGS)
 endif
 
 post-install:
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index c948531b2..d3a55ad1f 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -60,6 +60,7 @@ CONFIGURE_ARGS=		--with-z=${STAGING_TARGET_DIR}/usr \
 			--without-nbs \
 			--without-netsnmp \
 			--without-newt \
+			--without-openais \
 			--without-osptk \
 			--without-oss \
 			--without-popt \
diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile
index f968db8d2..a2d8f365e 100644
--- a/package/cluster-glue/Makefile
+++ b/package/cluster-glue/Makefile
@@ -13,6 +13,8 @@ PKG_BUILDDEP:=		glib bzip2 e2fsprogs
 PKG_URL:=		http://www.linux-ha.org/wiki/Cluster_Glue
 PKG_SITES:=		http://openadk.org/distfiles/
 
+PKG_CFLINE_CLUSTER_GLUE:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CLUSTER_GLUE,cluster-glue,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile
index b41283736..11d8cc9a4 100644
--- a/package/libhugetlbfs/Makefile
+++ b/package/libhugetlbfs/Makefile
@@ -13,6 +13,7 @@ PKG_URL:=		http://libhugetlbfs.ozlabs.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libhugetlbfs/}
 
 PKG_CFLINE_LIBHUGETLBFS:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_ARCH_DEPENDS:=	x86 x86_64 arm
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/llvm/patches/patch-Makefile_rules b/package/llvm/patches/patch-Makefile_rules
new file mode 100644
index 000000000..51ead24f5
--- /dev/null
+++ b/package/llvm/patches/patch-Makefile_rules
@@ -0,0 +1,11 @@
+--- llvm-2.9.orig/Makefile.rules	2011-03-25 07:26:58.000000000 +0100
++++ llvm-2.9/Makefile.rules	2011-07-30 12:32:43.143700539 +0200
+@@ -550,7 +550,7 @@ endif
+ ifndef KEEP_SYMBOLS
+   Strip := $(PLATFORMSTRIPOPTS)
+   StripWarnMsg := "(without symbols)"
+-  Install.StripFlag += -s
++  Install.StripFlag +=
+ endif
+ 
+ ifdef TOOL_NO_EXPORTS
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index ee2e09a44..2529c1eec 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
 PKG_VERSION:=		1.0-32749
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		aadc5d8cca503c8b18b3ed00b3a52cf5
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
@@ -17,7 +17,7 @@ PKG_BUILDDEP+=		libX11 libXv libpng libXext jpeg
 PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips
 
 PKG_FLAVOURS_MPLAYER:=	WITH_DIRECTFB
 PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
@@ -30,15 +30,12 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 # gcc 4.5 produces internal compiler error with -Os
-TCFLAGS:=$(subst Os,O2,$(TCFLAGS))
+TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS))
 
 CONFIG_STYLE:=		minimal
 FAKE_FLAGS+=		INSTALLSTRIP=''
 
-ifeq (${ADK_LINUX_MIPS64EL},y)
-EXTRA_CFLAGS:=		-DARCH_MIPS64
-endif
-ifeq (${ADK_LINUX_MIPS64},y)
+ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
 EXTRA_CFLAGS:=		-DARCH_MIPS64
 endif
 
diff --git a/package/mplayer/patches/patch-Makefile b/package/mplayer/patches/patch-Makefile
index 3f57255db..bb8529c8c 100644
--- a/package/mplayer/patches/patch-Makefile
+++ b/package/mplayer/patches/patch-Makefile
@@ -1,6 +1,14 @@
 --- mplayer-1.0-32749.orig/Makefile	2011-01-03 11:27:11.000000000 +0100
-+++ mplayer-1.0-32749/Makefile	2011-02-05 18:20:49.000000000 +0100
-@@ -816,7 +816,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
++++ mplayer-1.0-32749/Makefile	2011-07-29 17:44:21.073424743 +0200
+@@ -185,7 +185,6 @@ SRCS_COMMON-$(NEED_STRSEP)           += 
+ SRCS_COMMON-$(NEED_SWAB)             += osdep/swab.c
+ SRCS_COMMON-$(NEED_VSSCANF)          += osdep/vsscanf.c
+ SRCS_COMMON-$(NETWORKING)            += stream/stream_netstream.c \
+-                                        stream/asf_mmst_streaming.c \
+                                         stream/asf_streaming.c \
+                                         stream/cookies.c \
+                                         stream/http.c \
+@@ -816,7 +815,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
  	$(CC) -o $@ $^ $(EXTRALIBS)
  
  codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
diff --git a/package/mplayer/patches/patch-stream_asf_mmst_streaming_c b/package/mplayer/patches/patch-stream_asf_mmst_streaming_c
new file mode 100644
index 000000000..b16cec430
--- /dev/null
+++ b/package/mplayer/patches/patch-stream_asf_mmst_streaming_c
@@ -0,0 +1,23 @@
+--- mplayer-1.0-32749.orig/stream/asf_mmst_streaming.c	2011-01-03 11:26:52.000000000 +0100
++++ mplayer-1.0-32749/stream/asf_mmst_streaming.c	2011-07-29 17:29:01.494032168 +0200
+@@ -359,20 +359,7 @@ static int interp_header (uint8_t *heade
+       }
+ 
+     } else {
+-#if 0
+-      int b = i;
+-      printf ("unknown object (guid: %016llx, %016llx, len: %lld)\n", guid_1, guid_2, length);
+-      for (; b < length; b++)
+-      {
+-        if (isascii(header[b]) || isalpha(header[b]))
+-	    printf("%c ", header[b]);
+-	else
+-    	    printf("%x ", header[b]);
+-      }
+-      printf("\n");
+-#else
+       mp_msg(MSGT_NETWORK,MSGL_WARN,MSGTR_MPDEMUX_MMST_UnknownObject);
+-#endif
+     }
+ 
+ //    mp_msg(MSGT_NETWORK,MSGL_INFO,"length    : %lld\n", length);
diff --git a/package/mplayer/patches/patch-stream_asf_streaming_c b/package/mplayer/patches/patch-stream_asf_streaming_c
new file mode 100644
index 000000000..4fa3b696b
--- /dev/null
+++ b/package/mplayer/patches/patch-stream_asf_streaming_c
@@ -0,0 +1,27 @@
+--- mplayer-1.0-32749.orig/stream/asf_streaming.c	2011-01-03 11:26:52.000000000 +0100
++++ mplayer-1.0-32749/stream/asf_streaming.c	2011-07-29 17:54:35.013424616 +0200
+@@ -38,7 +38,6 @@
+ 
+ #include "stream.h"
+ #include "libmpdemux/demuxer.h"
+-#include "asf_mmst_streaming.h"
+ #include "network.h"
+ #include "tcp.h"
+ 
+@@ -87,16 +86,6 @@ static int asf_streaming_start( stream_t
+ 		if( fd==-2 ) return -1;
+ 	}
+ 
+-    //Is protocol mms or mmst?
+-    if (!strcasecmp(proto, "mmst") || !strcasecmp(proto, "mms"))
+-    {
+-		mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/TCP...\n");
+-		fd = asf_mmst_streaming_start( stream );
+-		stream->streaming_ctrl->url->port = port;
+-		if( fd>-1 ) return fd;
+-		mp_msg(MSGT_NETWORK,MSGL_V,"  ===> ASF/TCP failed\n");
+-		if( fd==-2 ) return -1;
+-	}
+ 
+     //Is protocol http, http_proxy, or mms?
+     if (!strcasecmp(proto, "http_proxy") || !strcasecmp(proto, "http") ||
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 2233c476b..db8e28e6b 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -24,7 +24,7 @@ PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 			http://icedtea.classpath.org/download/drops/ \
 			http://icedtea.classpath.org/download/source/
 
-PKG_CFLINE_OPENJDK:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_CFLINE_OPENJDK:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 
 # autotools infrastructure for OpenJDK
 ICEDTEA_NAME:=		icedtea6
diff --git a/package/resource-agents/Makefile b/package/resource-agents/Makefile
index 50b5fafe7..b68da9226 100644
--- a/package/resource-agents/Makefile
+++ b/package/resource-agents/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		ha
 PKG_URL:=		https://github.com/ClusterLabs/resource-agents
 PKG_SITES:=		http://openadk.org/distfiles/
 
+PKG_CFLINE_RESOURCE_AGENTS:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RESOURCE_AGENTS,resource-agents,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/xf86-video-geode/patches/patch-src_z4l_c b/package/xf86-video-geode/patches/patch-src_z4l_c
new file mode 100644
index 000000000..6875eb2f3
--- /dev/null
+++ b/package/xf86-video-geode/patches/patch-src_z4l_c
@@ -0,0 +1,10 @@
+--- xf86-video-geode-2.11.10.orig/src/z4l.c	2010-11-09 10:20:07.000000000 +0100
++++ xf86-video-geode-2.11.10/src/z4l.c	2011-07-31 20:58:18.763424329 +0200
+@@ -55,7 +55,6 @@ typedef long long __s64;
+ #define __u64 __u_64
+ typedef unsigned long long __u64;
+ 
+-#include "linux/videodev.h"
+ #define __user
+ #include "linux/videodev2.h"
+