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

5 files changed, 27 insertions, 13 deletions

diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index d009394f7..407c3a65c 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		aiccu
 PKG_VERSION:=		20070115
-PKG_RELEASE:=		10
+PKG_RELEASE:=		11
 PKG_MD5SUM:=		c9bcc83644ed788e22a7c3f3d4021350
 PKG_DESCR:=		SixXS Automatic IPv6 Connectivity Client Utility
 PKG_SECTION:=		ipv6
@@ -13,6 +13,8 @@ PKG_DEPENDS:=		kmod-ipv6 kmod-tun libpthread
 PKG_URL:=		http://www.sixxs.net/
 PKG_SITES:=		http://www.sixxs.net/archive/sixxs/aiccu/unix/
 
+PKG_LIBC_DEPENDS:=	uclibc glibc
+
 DISTFILES:=		$(PKG_NAME)_$(PKG_VERSION).tar.gz
 WRKDIST=		${WRKDIR}/$(PKG_NAME)
 
diff --git a/package/aiccu/patches/patch-common_common_h b/package/aiccu/patches/patch-common_common_h
new file mode 100644
index 000000000..42cd7b5a2
--- /dev/null
+++ b/package/aiccu/patches/patch-common_common_h
@@ -0,0 +1,12 @@
+--- aiccu.orig/common/common.h	2007-01-11 15:50:51.000000000 +0100
++++ aiccu/common/common.h	2014-03-16 21:47:28.000000000 +0100
+@@ -91,7 +91,9 @@
+ 	#include <sys/select.h>
+ 
+ 	#include <net/if.h>
++#ifdef __GLIBC__
+ 	#include <netinet/if_ether.h>
++#endif
+ #ifdef linux
+ 	#include <netpacket/packet.h>
+ 	#include <linux/if_tun.h>
diff --git a/package/aiccu/src/common/dn_skipname.c b/package/aiccu/src/common/dn_skipname.c
index f2219f335..3b4a756b9 100644
--- a/package/aiccu/src/common/dn_skipname.c
+++ b/package/aiccu/src/common/dn_skipname.c
@@ -9,10 +9,10 @@
  * return:
  *      0 on success, -1 (with errno set) on failure.
  */
-int ns_name_skip(const u_char **ptrptr, const u_char *eom)
+int ns_name_skip(const unsigned char **ptrptr, const unsigned char *eom)
 {
-	const u_char *cp;
-	u_int n;
+	const unsigned char *cp;
+	unsigned int n;
 
 	cp = *ptrptr;
 	while (cp < eom && (n = *cp++) != 0)
@@ -40,9 +40,9 @@ int ns_name_skip(const u_char **ptrptr, const u_char *eom)
 	return (0);
 }
 
-int dn_skipname(const u_char *ptr, const u_char *eom)
+int dn_skipname(const unsigned char *ptr, const unsigned char *eom)
 {
-	const u_char *saveptr = ptr;
+	const unsigned char *saveptr = ptr;
 
 	if(ns_name_skip(&ptr, eom) == -1)
 		return (-1);
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 598f58a06..7d5eefa66 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		readline ncurses
 PKG_URL:=		http://freshmeat.net/projects/atftp/
 PKG_SITES:=		ftp://ftp.mamalinux.com/pub/atftp/
 
+PKG_LIBC_DEPENDS:=	uclibc glibc
+
 PKG_SUBPKGS:=		ATFTP ATFTPD
 PKGSD_ATFTPD:=		TFTP server
 PKGSS_ATFTPD:=		libreadline libncurses
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index 891651d3a..ef3e70b28 100644
--- a/package/pcc/Makefile
+++ b/package/pcc/Makefile
@@ -22,19 +22,17 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,PCC,pcc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 # we cross-compile a native compiler for the target system
-CONFIGURE_ARGS+=	--host=${GNU_TARGET_NAME}
-CONFIGURE_ARGS+=	--target=${GNU_TARGET_NAME}
-CONFIGURE_ARGS+=	--with-assembler=/usr/bin/as
-CONFIGURE_ARGS+=	--with-linker=/usr/bin/ld
+CONFIGURE_ARGS+=	--host=${GNU_TARGET_NAME} \
+			--target=${GNU_TARGET_NAME} \
+			--with-assembler=/usr/bin/as \
+			--with-linker=/usr/bin/ld
 
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 TARGET_CPPFLAGS+=	-DADK_FOR_GLIBC
-else
+endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 TARGET_CPPFLAGS+=	-DADK_FOR_UCLIBC
 endif
-endif
-endif
 
 pcc-install:
 	$(INSTALL_DIR) $(IDIR_PCC)