Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk

12 files changed, 145 insertions, 13 deletions

diff --git a/package/bitlbee/patches/patch-lib_Makefile b/package/bitlbee/patches/patch-lib_Makefile
new file mode 100644
index 000000000..8fc2484cc
--- /dev/null
+++ b/package/bitlbee/patches/patch-lib_Makefile
@@ -0,0 +1,20 @@
+--- bitlbee-1.2.4.orig/lib/Makefile	2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/lib/Makefile	2010-03-07 19:58:49.626028152 +0100
+@@ -12,7 +12,7 @@
+ objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+ 
+ CFLAGS += -Wall
+-LFLAGS += -r
++LFLAGS += -Wl,-r -nostdlib
+ 
+ # [SH] Phony targets
+ all: lib.o
+@@ -32,7 +32,7 @@ distclean: clean $(subdirs)
+ 
+ lib.o: $(objects) $(subdirs)
+ 	@echo '*' Linking lib.o
+-	@$(LD) $(LFLAGS) $(objects) -o lib.o
++	@$(CC) $(LFLAGS) $(objects) -o lib.o
+ 
+ $(objects): ../Makefile.settings Makefile
+ 
diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile
new file mode 100644
index 000000000..ffb47b391
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_Makefile
@@ -0,0 +1,20 @@
+--- bitlbee-1.2.4.orig/protocols/Makefile	2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/protocols/Makefile	2010-03-07 20:02:06.789785295 +0100
+@@ -21,7 +21,7 @@ subdirobjs = $(PROTOOBJS)
+ # Expansion of variables
+ subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs)))
+ CFLAGS += -Wall
+-LFLAGS += -r
++LFLAGS += -Wl,-r -nostdlib
+ 
+ # [SH] Phony targets
+ all: protocols.o
+@@ -44,7 +44,7 @@ $(subdirs):
+ 
+ protocols.o: $(objects) $(subdirs)
+ 	@echo '*' Linking protocols.o
+-	@$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
++	@$(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
+ 
+ $(objects): ../Makefile.settings Makefile
+ 
diff --git a/package/bitlbee/patches/patch-protocols_jabber_Makefile b/package/bitlbee/patches/patch-protocols_jabber_Makefile
new file mode 100644
index 000000000..b1dc63a0e
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_jabber_Makefile
@@ -0,0 +1,17 @@
+--- bitlbee-1.2.4.orig/protocols/jabber/Makefile	2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/protocols/jabber/Makefile	2010-03-07 20:00:36.426039459 +0100
+@@ -12,7 +12,7 @@
+ objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o
+ 
+ CFLAGS += -Wall
+-LFLAGS += -r
++LFLAGS += -Wl,-r -nostdlib
+ 
+ # [SH] Phony targets
+ all: jabber_mod.o
+@@ -38,4 +38,4 @@ $(objects): %.o: %.c
+ 
+ jabber_mod.o: $(objects)
+ 	@echo '*' Linking jabber_mod.o
+-	@$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
++	@$(CC) $(LFLAGS) $(objects) -o jabber_mod.o
diff --git a/package/bitlbee/patches/patch-protocols_msn_Makefile b/package/bitlbee/patches/patch-protocols_msn_Makefile
new file mode 100644
index 000000000..8f634c5f6
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_msn_Makefile
@@ -0,0 +1,19 @@
+--- bitlbee-1.2.4.orig/protocols/msn/Makefile	2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/protocols/msn/Makefile	2010-03-07 20:00:17.406036329 +0100
+@@ -12,7 +12,7 @@
+ objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
+ 
+ CFLAGS += -Wall
+-LFLAGS += -r
++LFLAGS += -Wl,-r -nostdlib
+ 
+ # [SH] Phony targets
+ all: msn_mod.o
+@@ -38,6 +38,6 @@ $(objects): %.o: %.c
+ 
+ msn_mod.o: $(objects)
+ 	@echo '*' Linking msn_mod.o
+-	@$(LD) $(LFLAGS) $(objects) -o msn_mod.o
++	@$(CC) $(LFLAGS) $(objects) -o msn_mod.o
+ 	
+ 
diff --git a/package/bitlbee/patches/patch-protocols_oscar_Makefile b/package/bitlbee/patches/patch-protocols_oscar_Makefile
new file mode 100644
index 000000000..2d7e0dde0
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_oscar_Makefile
@@ -0,0 +1,17 @@
+--- bitlbee-1.2.4.orig/protocols/oscar/Makefile	2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/protocols/oscar/Makefile	2010-03-07 20:00:56.836124250 +0100
+@@ -12,7 +12,7 @@
+ objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o
+ 
+ CFLAGS += -Wall
+-LFLAGS += -r
++LFLAGS += -Wl,-r -nostdlib
+ 
+ # [SH] Phony targets
+ all: oscar_mod.o
+@@ -38,4 +38,4 @@ $(objects): %.o: %.c
+ 
+ oscar_mod.o: $(objects)
+ 	@echo '*' Linking oscar_mod.o
+-	@$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
++	@$(CC) $(LFLAGS) $(objects) -o oscar_mod.o
diff --git a/package/bitlbee/patches/patch-protocols_yahoo_Makefile b/package/bitlbee/patches/patch-protocols_yahoo_Makefile
new file mode 100644
index 000000000..4df3cc046
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_yahoo_Makefile
@@ -0,0 +1,17 @@
+--- bitlbee-1.2.4.orig/protocols/yahoo/Makefile	2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/protocols/yahoo/Makefile	2010-03-07 20:01:11.066203660 +0100
+@@ -12,7 +12,7 @@
+ objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o
+ 
+ CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB
+-LFLAGS += -r
++LFLAGS += -Wl,-r -nostdlib
+ 
+ # [SH] Phony targets
+ all: yahoo_mod.o
+@@ -38,4 +38,4 @@ $(objects): %.o: %.c
+ 
+ yahoo_mod.o: $(objects)
+ 	@echo '*' Linking yahoo_mod.o
+-	@$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o
++	@$(CC) $(LFLAGS) $(objects) -o yahoo_mod.o
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index ab50a5aec..400be01e6 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.15.2
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		495e320537f0772125f2db3c098e437c
 PKG_DESCR:=		Core utilities for embedded Linux systems
 PKG_SECTION:=		base
@@ -16,9 +16,9 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIG_STYLE:=	manual
-BUILD_STYLE:=	manual
-INSTALL_STYLE:=	manual
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 ${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
 	grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
@@ -32,31 +32,31 @@ do-configure: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
 ifeq ($(ADK_NATIVE),y)
 	yes '' | \
 	$(MAKE) V=1 \
-	    IPKG_ARCH="$(ARCH)" \
+	    IPKG_ARCH="$(CPU_ARCH)" \
 	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
 else
 	yes '' | \
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-	    EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
+	    EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(CPU_ARCH)" \
 	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
 endif
 
 do-build: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) V=1 \
-	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
 else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
 endif
 
 do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) V=1 \
-	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
 else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
 endif
 	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
 ifeq ($(ADK_DEBUG),y)
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index f4efcccf5..4b23156ef 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -24,7 +24,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--disable-selinux
+CONFIGURE_ARGS+=	--disable-selinux --disable-static
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib
diff --git a/package/cvs/patches/patch-lib_getline_c b/package/cvs/patches/patch-lib_getline_c
new file mode 100644
index 000000000..c522c6a0a
--- /dev/null
+++ b/package/cvs/patches/patch-lib_getline_c
@@ -0,0 +1,11 @@
+--- cvs-1.11.23.orig/lib/getline.c	2005-04-04 22:46:05.000000000 +0200
++++ cvs-1.11.23/lib/getline.c	2010-03-07 20:38:26.117286460 +0100
+@@ -155,7 +155,7 @@ getstr (lineptr, n, stream, terminator, 
+ }
+ 
+ int
+-getline (lineptr, n, stream)
++get_line (lineptr, n, stream)
+      char **lineptr;
+      size_t *n;
+      FILE *stream;
diff --git a/package/cvs/patches/patch-lib_getline_h b/package/cvs/patches/patch-lib_getline_h
new file mode 100644
index 000000000..33e01c6bd
--- /dev/null
+++ b/package/cvs/patches/patch-lib_getline_h
@@ -0,0 +1,11 @@
+--- cvs-1.11.23.orig/lib/getline.h	2005-04-04 22:46:05.000000000 +0200
++++ cvs-1.11.23/lib/getline.h	2010-03-07 20:38:36.898630307 +0100
+@@ -12,7 +12,7 @@
+ #define GETLINE_NO_LIMIT -1
+ 
+ int
+-  getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
++  get_line __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
+ int
+   getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
+                          int limit));
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 0a734af58..6f7262dc5 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP+=		libffi zlib
 PKG_URL:=		http://jamvm.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
-PKG_TARGET_DEPENDS:=	!foxboard
+PKG_TARGET_DEPENDS:=	!foxboard !lemote
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/parted/Makefile b/package/parted/Makefile
index 03df2e270..b54746dda 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		055305bc7bcf472ce38f9abf69a9d94d
 PKG_DESCR:=		GNU parted
 PKG_SECTION:=		admin
-PKG_DEPENDS:=		libuuid libreadline device-mapper libpthread
+PKG_DEPENDS:=		libuuid libreadline libdevmapper libpthread
 PKG_BUILDDEP+=		e2fsprogs lvm readline
 PKG_URL:=		http://www.gnu.org/software/parted/index.shtml
 PKG_SITES:=		${MASTER_SITE_GNU:=parted/}