summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-26 18:07:04 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-26 18:07:04 +0100
commitbd3bb05b0be7f0ef4d8ec06b9cc5fa4c2f99b540 (patch)
tree2144be3038a025cc2cbae4798a5b93d3bb178a8c /package
parentd913811021f72e34fdd7886a627f711c0f0f51e0 (diff)
parent071d460a06da4189383e79049ffa03323571a201 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/exmap/Makefile31
-rw-r--r--package/libffi/Makefile1
2 files changed, 10 insertions, 22 deletions
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index 9ea289eaf..6755f89df 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -5,32 +5,23 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= exmap
PKG_VERSION:= 0.4.1
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= 55aec784e214037e61400287a55b5426
-PKG_DESCR:= memory analysing client tool
+PKG_DESCR:= memory analysing tools
PKG_SECTION:= debug
-PKG_DEPENDS:= exmap-kmod libreadline glib
+PKG_DEPENDS:= libreadline glib
PKG_BUILDDEP:= glib readline autotool
PKG_SITES:= http://labs.o-hand.com/sources/exmap-console/
PKG_ARCH_DEPENDS:= !m68k
PKG_CFLINE_EXMAP:= depends on !ADK_TOOLCHAIN_ONLY
-PKG_SUBPKGS:= EXMAP EXMAPD EXMAPSERVER EXMAP_KMOD
-PKGSD_EXMAPD:= memory analysing daemon
-PKGSD_EXMAPSERVER:= memory analysing server
-PKGSD_EXMAP_KMOD:= memory analysing kernel module
-PKGSC_EXMAP_KMOD:= kernel
-
DISTFILES:= ${PKG_NAME}-console-${PKG_VERSION}.tgz
WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_EXMAPD},${PKG_SECTION}))
-$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_EXMAPSERVER},${PKG_SECTION}))
-$(eval $(call PKG_template,EXMAP_KMOD,exmap-kmod,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKGSD_EXMAP_KMOD},${PKGSC_EXMAP_KMOD}))
AUTOTOOL_STYLE:= autoreconf
CONFIGURE_ARGS+= --disable-doc
@@ -39,17 +30,13 @@ CONFIGURE_ENV+= LIBS="-lncurses"
pre-build:
$(MAKE) -C ${WRKBUILD}/kernel $(KERNEL_MODULE_FLAGS)
-post-install:
- ${INSTALL_DIR} ${IDIR_EXMAP_KMOD}/etc/modules.d/
- echo "exmap" > ${IDIR_EXMAP_KMOD}/etc/modules.d/90-exmap
- ${INSTALL_DIR} ${IDIR_EXMAP_KMOD}/lib/modules/${KERNEL_VERSION}/
+exmap-install:
+ ${INSTALL_DIR} ${IDIR_EXMAP}/etc/modules.d/
+ echo "exmap" > ${IDIR_EXMAP}/etc/modules.d/90-exmap
+ ${INSTALL_DIR} ${IDIR_EXMAP}/lib/modules/${KERNEL_VERSION}/
${INSTALL_DATA} ${WRKBUILD}/kernel/exmap.ko \
- ${IDIR_EXMAP_KMOD}/lib/modules/${KERNEL_VERSION}
+ ${IDIR_EXMAP}/lib/modules/${KERNEL_VERSION}
${INSTALL_DIR} ${IDIR_EXMAP}/usr/sbin
- ${INSTALL_BIN} ${WRKBUILD}/src/exmap ${IDIR_EXMAP}/usr/sbin
- ${INSTALL_DIR} ${IDIR_EXMAPD}/usr/sbin
- ${INSTALL_BIN} ${WRKBUILD}/src/exmapd ${IDIR_EXMAPD}/usr/sbin
- ${INSTALL_DIR} ${IDIR_EXMAPSERVER}/usr/sbin
- ${INSTALL_BIN} ${WRKBUILD}/src/exmapserver ${IDIR_EXMAPSERVER}/usr/sbin
+ ${INSTALL_BIN} ${WRKBUILD}/src/exmap* ${IDIR_EXMAP}/usr/sbin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libffi/Makefile b/package/libffi/Makefile
index 0b316720d..a7e957582 100644
--- a/package/libffi/Makefile
+++ b/package/libffi/Makefile
@@ -10,6 +10,7 @@ PKG_MD5SUM:= 45f3b6dbc9ee7c7dfbbbc5feba571529
PKG_DESCR:= Foreign Function Interface library
PKG_SECTION:= libs
PKG_BUILDDEP:= autotool libffi-host
+HOST_BUILDDEP:= autotool
PKG_URL:= http://sourceware.org/libffi/
PKG_SITES:= ftp://sourceware.org/pub/libffi/
PKG_OPTS:= dev