Bläddra i källkod

add gperf to tools, required for eglibc builds. do not ask the user to install it

Waldemar Brodkorb 10 år sedan
förälder
incheckning
0fc1d605ff
4 ändrade filer med 29 tillägg och 23 borttagningar
  1. 1 1
      package/pacemaker-mgmt/Makefile
  2. 0 22
      scripts/scan-pkgs.sh
  3. 3 0
      tools/Makefile
  4. 25 0
      tools/gperf/Makefile

+ 1 - 1
package/pacemaker-mgmt/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		be16a38588d1c518f53e64e7e48e1c90
 PKG_DESCR:=		Pacemaker management daemon
 PKG_SECTION:=		ha
-PKG_BUILDDEP:=		pacemaker gnutls pam python2
+PKG_BUILDDEP:=		swig-host pacemaker gnutls pam python2
 PKG_URL:=		http://hg.clusterlabs.org/pacemaker/pygui/
 PKG_SITES:=		http://openadk.org/distfiles/
 

+ 0 - 22
scripts/scan-pkgs.sh

@@ -97,14 +97,6 @@ if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
 	NEED_XMLTO="$NEED_XMLTO libXfont"
 fi
 
-if [[ -n $ADK_PACKAGE_PACEMAKER_MGMTD ]]; then
-	NEED_SWIG="$NEED_SWIG pacemaker-mgmtd"
-fi
-
-if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
-	NEED_GPERF="$NEED_GPERF eglibc"
-fi
-
 if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_100DPI ]]; then
 	NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi"
 fi
@@ -246,20 +238,6 @@ if [[ -n $NEED_WWW ]]; then
 	fi
 fi
 
-if [[ -n $NEED_SWIG ]]; then
-	if ! which swig >/dev/null 2>&1; then
-		echo >&2 You need swig to build $NEED_SWIG
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_GPERF ]]; then
-	if ! which gperf >/dev/null 2>&1; then
-		echo >&2 You need gperf to build $NEED_GPERF
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_GXX ]]; then
 	if ! which g++ >/dev/null 2>&1; then
 		echo >&2 You need GNU c++ compiler to build $NEED_GXX

+ 3 - 0
tools/Makefile

@@ -7,6 +7,9 @@ TARGETS:=adk mkcrypt cpio mkimage genext2fs
 ifeq ($(ADK_TARGET_ROOTFS_ISO),y)
 TARGETS+=cdrtools syslinux
 endif
+ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
+TARGETS+=gperf
+endif
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))

+ 25 - 0
tools/gperf/Makefile

@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		gperf
+PKG_VERSION:=		3.0.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c1f1db32fb6598d6a93e6e88796a8632
+PKG_SITES:=		http://ftp.gnu.org/pub/gnu/gperf/
+
+include ../rules.mk
+
+install: ${TOOLS_DIR}/gperf
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	(cd ${WRKBUILD}; ./configure)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
+	touch $@
+
+${TOOLS_DIR}/gperf: $(WRKBUILD)/.compiled
+	$(INSTALL_BIN) $(WRKBUILD)/src/gperf \
+		${TOOLS_DIR}
+
+include $(TOPDIR)/mk/tools.mk