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

11 files changed, 68 insertions, 66 deletions

diff --git a/package/boost/Makefile b/package/boost/Makefile
index b47de4936..8177a49a4 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -41,6 +41,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BOOST,boost,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+include ${TOPDIR}/mk/python.mk
+
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
@@ -98,7 +100,7 @@ endif
 # some variables for build
 GPP_PATH:=	${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++
 GPP_VERSION:=	"`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`"
-BJAM_PATH:=	"`find ${WRKBUILD} -type f -name "bjam"`"
+BJAM_PATH:=	"`find ${WRKBUILD} -type f -name "bjam$(EXEEXT)"`"
 PYTHON_PATH:=	${STAGING_TARGET_DIR}/usr/bin/python
 PYTHON_INCLUDE:="`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`"
 PYTHON_LIB:=	"`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`"
@@ -114,19 +116,18 @@ do-build:
 	${SED} "/^using gcc/d" ${USER_JAM}
 # add using gcc line with determined options to user.jam
 	echo "using gcc : ${GPP_VERSION} : ${GPP_PATH} ;" >> ${USER_JAM};
-
 # remove exisiting using python line from user.jam
 	${SED} "/^using python/d" ${USER_JAM}
 ifneq (${ADK_PACKAGE_BOOST_PYTHON},)
 # add using python line with determined options to user.jam
 	echo "using python : ${PYTHON_VERSION} : ${PYTHON_PATH} : ${PYTHON_INCLUDE} : ${PYTHON_LIB} ;" >> ${USER_JAM};
 endif
-
 # run bjam to build boost
 	( cd ${WRKBUILD}; \
 		${BJAM_PATH} \
 			-sBUILD=release \
-			--toolset=gcc-${GPP_VERSION} \
+			target-os=linux \
+			toolset=gcc-${GPP_VERSION} \
 			--build-type=minimal \
 			--layout=versioned \
 			--disable-long-double \
diff --git a/package/daq/Makefile b/package/daq/Makefile
index 2ea031810..be48531c6 100644
--- a/package/daq/Makefile
+++ b/package/daq/Makefile
@@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		daq
 PKG_VERSION:=		2.0.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		a00855a153647df76d47f1ea454f74ae
 PKG_DESCR:=		daq
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libpcap
-PKG_BUILDDEP:=		libpcap
+PKG_BUILDDEP:=		libpcap autotool
 PKG_URL:=		http://www.snort.org
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
@@ -19,6 +19,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+AUTOTOOL_STYLE:=	autoreconf
+
 daq-install:
 	$(INSTALL_DIR) $(IDIR_DAQ)/usr/lib/daq
 	$(CP) $(WRKINST)/usr/lib/daq/*.so \
diff --git a/package/daq/patches/patch-configure b/package/daq/patches/patch-configure
deleted file mode 100644
index e23ab323a..000000000
--- a/package/daq/patches/patch-configure
+++ /dev/null
@@ -1,56 +0,0 @@
---- daq-2.0.0.orig/configure	2012-11-05 22:07:56.000000000 +0100
-+++ daq-2.0.0/configure	2013-07-17 11:03:24.000000000 +0200
-@@ -12771,53 +12771,6 @@ fi
-         echo
-         exit 1
-     fi
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcap version >= \"1.0.0\"" >&5
--$as_echo_n "checking for libpcap version >= \"1.0.0\"... " >&6; }
--    if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--    #include <pcap.h>
--    #include <string.h>
--    extern char pcap_version[];
--
--int
--main ()
--{
--
--        if (strcmp(pcap_version, "1.0.0") < 0)
--            return 1;
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  libpcap_version_1x="yes"
--else
--  libpcap_version_1x="no"
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--    if test "x$libpcap_version_1x" = "xno"; then
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--        echo
--        echo "    ERROR!  Libpcap library version >= "1.0.0"  not found."
--        echo "    Get it from http://www.tcpdump.org"
--        echo
--        exit 1
--    else
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--    fi
- 
-     if test "$enable_pcap_module" = yes; then
-         STATIC_LIBS="${STATIC_LIBS} -lpcap"
diff --git a/package/daq/patches/patch-configure_ac b/package/daq/patches/patch-configure_ac
new file mode 100644
index 000000000..4f8d40df3
--- /dev/null
+++ b/package/daq/patches/patch-configure_ac
@@ -0,0 +1,10 @@
+--- daq-2.0.0.orig/configure.ac	2012-09-06 17:17:23.000000000 +0200
++++ daq-2.0.0/configure.ac	2013-11-15 15:21:19.546122100 +0100
+@@ -179,7 +179,6 @@ AC_ARG_ENABLE(pcap-module,
+               [enable_pcap_module="$enableval"], [enable_pcap_module="$DEFAULT_ENABLE"])
+ if test "$enable_pcap_module" = yes; then
+     AC_CHECK_HEADER([pcap.h], [], [enable_pcap_module=no])
+-    AC_CHECK_PCAP_VER("1.0.0")
+     if test "$enable_pcap_module" = yes; then
+         STATIC_LIBS="${STATIC_LIBS} -lpcap"
+     fi
diff --git a/package/glib/patches/patch-glib_gstrfuncs_c b/package/glib/patches/patch-glib_gstrfuncs_c
new file mode 100644
index 000000000..ec0543675
--- /dev/null
+++ b/package/glib/patches/patch-glib_gstrfuncs_c
@@ -0,0 +1,15 @@
+--- glib-2.28.1.orig/glib/gstrfuncs.c	2011-02-16 03:55:33.000000000 +0100
++++ glib-2.28.1/glib/gstrfuncs.c	2013-11-06 18:24:29.973270200 +0100
+@@ -1423,12 +1423,6 @@ g_strsignal (gint signum)
+ #ifdef HAVE_STRSIGNAL
+   const char *msg_locale;
+ 
+-#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
+-extern const char *strsignal(int);
+-#else
+-  /* this is declared differently (const) in string.h on BeOS */
+-  extern char *strsignal (int sig);
+-#endif /* !G_OS_BEOS && !G_WITH_CYGWIN */
+   msg_locale = strsignal (signum);
+   if (g_get_charset (NULL))
+     return msg_locale;
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 6b5594045..78078cf83 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -9,7 +9,8 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		395455e4d3a51459374fe5ca8420aae8
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau xcb-proto
+PKG_BUILDDEP:=		xproto-host
+PKG_BUILDDEP+=		xproto xextproto xtrans libXdmcp libXau xcb-proto
 PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto libxcb
 PKG_DEPENDS:=		libxdmcp libxcb libxau
 PKG_SITES:=		${MASTER_SITE_XORG}
diff --git a/package/libdnet/patches/patch-dnet-config_in b/package/libdnet/patches/patch-dnet-config_in
new file mode 100644
index 000000000..43b6edb7e
--- /dev/null
+++ b/package/libdnet/patches/patch-dnet-config_in
@@ -0,0 +1,11 @@
+--- libdnet-1.11.orig/dnet-config.in	2001-10-19 03:29:00.000000000 +0200
++++ libdnet-1.11/dnet-config.in	2013-11-15 15:34:29.676762300 +0100
+@@ -3,7 +3,7 @@
+ # $Id: dnet-config.in,v 1.1 2001/10/19 01:29:00 dugsong Exp $
+ 
+ prefix=@prefix@
+-exec_prefix=@prefix@
++exec_prefix=${prefix}
+ 
+ usage()
+ {
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index d033af17d..dbcfcef86 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		9c0cfef285d5c4a5c80d00904ddab380
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
-PKG_BUILDDEP:=		zlib autotool
+PKG_BUILDDEP:=		autotool libxml2-host zlib
 PKG_URL:=		http://www.xmlsoft.org/
 PKG_SITES:=		http://xmlsoft.org/sources/
 PKG_OPTS:=		dev
@@ -24,13 +24,19 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
 endif
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXML2_PYTHON},${PKGSC_LIBXML2_PYTHON}))
 
 include $(TOPDIR)/mk/python.mk
 
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--without-python
+HOST_MAKE_FLAGS+=	LDFLAGS=-lpthread
+
 AUTOTOOL_STYLE:=	autoreconf
 TARGET_CFLAGS:=		$(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_LDFLAGS+=	-lpthread
@@ -75,4 +81,5 @@ libxml2-python-install:
 	$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/*.{so,py} \
 		$(IDIR_LIBXML2_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages
 	
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 3a34c5a63..c9f2ce521 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		9667bf6f9310b957254fdcf6596600b7
 PKG_DESCR:=		XSLT Library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libxml2
-PKG_BUILDDEP:=		libxml2
+PKG_BUILDDEP:=		python2-host libxml2-host libxslt-host libxml2
 PKG_URL:=		http://xmlsoft.org/XSLT
 PKG_SITES:=		http://xmlsoft.org/sources/
 PKG_NEED_CXX:=		1
@@ -24,11 +24,15 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
 endif
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,XSLTPROC,xsltproc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XSLTPROC},${PKGSC_XSLTPROC}))
 
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--with-libxml-prefix="${STAGING_TARGET_DIR}/usr" \
 			--with-libxml-include-prefix="${STAGING_TARGET_DIR}/usr/include/libxml2" \
 			--with-libxml-libs-prefix="${STAGING_TARGET_DIR}/usr/lib" \
@@ -47,4 +51,5 @@ libxslt-install:
 	${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libexslt.so* ${IDIR_LIBXSLT}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xproto/Makefile b/package/xproto/Makefile
index 3113dede3..5c123c089 100644
--- a/package/xproto/Makefile
+++ b/package/xproto/Makefile
@@ -9,11 +9,17 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		X Window System Core Protocol headers
 PKG_SECTION:=		devel
 PKG_MD5SUM:=		7ab1239930563a352cb3552fd2db4140
+PKG_BUILDDEP:=		xproto-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,XPROTO,xproto,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,XPROTO,xproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/yajl/Makefile b/package/yajl/Makefile
index 44f7d247b..79248e4d9 100644
--- a/package/yajl/Makefile
+++ b/package/yajl/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c953a53344c0e20a892fc042bbe69744
 PKG_DESCR:=		a small event-driven JSON parser written in ANSI C
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		cmake-host
+PKG_BUILDDEP:=		cmake-host ruby-host
 PKG_URL:=		http://lloyd.github.com/yajl/
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev