use bison-host and flex-host

6 files changed, 10 insertions, 37 deletions

diff --git a/package/bison/Makefile b/package/bison/Makefile
index 5bc18eae0..aaef1b631 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -12,11 +12,14 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://www.gnu.org/software/bison/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-XAKE_FLAGS+=		M4=m4
+HOST_STYLE:=		auto
+#XAKE_FLAGS+=		M4=m4
 
 bison-install:
 	${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison
@@ -24,4 +27,5 @@ bison-install:
 	${CP} ${WRKINST}/usr/share/bison/* ${IDIR_BISON}/usr/share/bison
 	$(CP) ./files/yacc ${IDIR_BISON}/usr/bin
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index a39c76bf7..4d40c3d91 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		bb23d9dbdafd395d816f7abc598481a1
 PKG_DESCR:=		Kerberos 5 server
 PKG_SECTION:=		crypto
-PKG_BUILDDEP:=		openssl ncurses e2fsprogs readline
+PKG_BUILDDEP:=		openssl ncurses e2fsprogs readline bison-host
 PKG_DEPENDS:=		libheimdal libncurses libcom-err libreadline libopenssl
 PKG_URL:=		http://www.h5l.org/
 PKG_SITES:=		http://www.h5l.org/dist/src/
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 21aa9b8aa..c20a09ce5 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libkrb5 libncurses libss libcom-err keyutils
 PKG_DEPENDS+=		libpthread
-PKG_BUILDDEP:=		ncurses e2fsprogs gettext-tiny
+PKG_BUILDDEP:=		ncurses e2fsprogs gettext-tiny bison-host
 PKG_URL:=		http://web.mit.edu/kerberos/
 PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.11/
 PKG_NOPARALLEL:=	1
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index e60207523..7a7507a06 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		f78455a92622b7a3c05c58b6ad1cec7e
 PKG_DESCR:=		a low-level packet capture library
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		flex-host bison-host
 PKG_URL:=		http://www.tcpdump.org/
 PKG_SITES:=		http://www.tcpdump.org/release/
 PKG_OPTS:=		dev
@@ -34,7 +35,7 @@ CONFIGURE_ARGS+=	--enable-ipv6
 else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
-XAKE_FLAGS+=		M4=m4
+#XAKE_FLAGS+=		M4=m4
 
 libpcap-install:
 	${INSTALL_DIR} ${IDIR_LIBPCAP}/usr/lib
diff --git a/package/pcmciautils/Makefile b/package/pcmciautils/Makefile
index 2f5e91961..1cec54440 100644
--- a/package/pcmciautils/Makefile
+++ b/package/pcmciautils/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		3c388cb559975b37a75cb5965e9800a9
 PKG_DESCR:=		Utilities for PCMCIA subsystem
 PKG_SECTION:=		utils
-PKG_BUILDDEP:=		sysfsutils
+PKG_BUILDDEP:=		sysfsutils bison-host flex-host
 PKG_URL:=		http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/kernel/pcmcia/
 
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index e00ef2da4..60888cfc7 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -91,14 +91,6 @@ if [[ -n $ADK_PACKAGE_MESALIB ]]; then
 	NEED_MAKEDEPEND="$NEED_MAKEDEPEND mesalib"
 fi
 
-if [[ -n $ADK_COMPILE_HEIMDAL ]]; then
-	NEED_BISON="$NEED_BISON heimdal-server"
-fi
-
-if [[ -n $ADK_COMPILE_KRB5 ]]; then
-	NEED_BISON="$NEED_BISON krb5"
-fi
-
 if [[ -n $ADK_COMPILE_OPENJDK ]]; then
 	NEED_ZIP="$NEED_ZIP openjdk"
 	NEED_GXX="$NEED_GXX openjdk"
@@ -123,11 +115,6 @@ if [[ -n $ADK_PACKAGE_LIBXCB ]]; then
 	NEED_XSLTPROC="$NEED_XSLTPROC libxcb"
 fi
 
-if [[ -n $ADK_COMPILE_PCMCIAUTILS ]]; then
-	NEED_BISON="$NEED_BISON pcmciautils"
-	NEED_FLEX="$NEED_FLEX pcmciautils"
-fi
-
 if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
 fi
@@ -144,11 +131,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_INTL="$NEED_INTL xkeyboard-config"
 fi
 
-if [[ -n $ADK_PACKAGE_LIBPCAP ]]; then
-	NEED_FLEX="$NEED_FLEX libpcap"
-	NEED_BISON="$NEED_BISON libpcap"
-fi
-
 if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
 	NEED_WWW="$NEED_WWW libXfont"
 	NEED_XMLTO="$NEED_XMLTO libXfont"
@@ -335,13 +317,6 @@ if [[ -n $NEED_WWW ]]; then
 	fi
 fi
 
-if [[ -n $NEED_BISON ]]; then
-	if ! which bison >/dev/null 2>&1; then
-		echo >&2 You need bison to build $NEED_BISON
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_ZIP ]]; then
 	if ! which zip >/dev/null 2>&1; then
 		echo >&2 You need zip to build $NEED_ZIP
@@ -398,13 +373,6 @@ if [[ -n $NEED_RPM ]]; then
 	fi
 fi
 
-if [[ -n $NEED_FLEX ]]; then
-	if ! which flex >/dev/null 2>&1; then
-		echo >&2 You need flex to build $NEED_FLEX
-		out=1
-	fi
-fi
-
 if [[ -n $ADK_LINUX_X86 ]]; then
 	if [[ -n $NEED_YASM ]]; then
 		if ! which yasm >/dev/null 2>&1; then