diff options
| -rw-r--r-- | package/pacemaker-mgmt/Makefile | 2 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 22 | ||||
| -rw-r--r-- | tools/Makefile | 3 | ||||
| -rw-r--r-- | tools/gperf/Makefile | 25 |
4 files changed, 29 insertions, 23 deletions
diff --git a/package/pacemaker-mgmt/Makefile b/package/pacemaker-mgmt/Makefile index a762af376..9dad6eba6 100644 --- a/package/pacemaker-mgmt/Makefile +++ b/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/ diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 4c201560a..c94d01138 100644 --- a/scripts/scan-pkgs.sh +++ b/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 diff --git a/tools/Makefile b/tools/Makefile index 4a5f1ec92..e644efbb1 100644 --- a/tools/Makefile +++ b/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)) diff --git a/tools/gperf/Makefile b/tools/gperf/Makefile new file mode 100644 index 000000000..2d811932b --- /dev/null +++ b/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 |