Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[7543] branches/1.0/package
|
From: <abe...@us...> - 2016-02-19 01:11:49
|
Revision: 7543
http://sourceforge.net/p/astlinux/code/7543
Author: abelbeck
Date: 2016-02-19 01:11:46 +0000 (Fri, 19 Feb 2016)
Log Message:
-----------
htop, version bump to 1.0.3, not enabled by default (yet)
Modified Paths:
--------------
branches/1.0/package/arp-scan/arp-scan.mk
branches/1.0/package/htop/Config.in
branches/1.0/package/htop/htop.mk
Removed Paths:
-------------
branches/1.0/package/htop/htop.patch
Modified: branches/1.0/package/arp-scan/arp-scan.mk
===================================================================
--- branches/1.0/package/arp-scan/arp-scan.mk 2016-02-18 23:31:57 UTC (rev 7542)
+++ branches/1.0/package/arp-scan/arp-scan.mk 2016-02-19 01:11:46 UTC (rev 7543)
@@ -3,6 +3,7 @@
# arp-scan
#
################################################################################
+
ARP_SCAN_VERSION = 1.9
ARP_SCAN_SOURCE = arp-scan-$(ARP_SCAN_VERSION).tar.gz
ARP_SCAN_SITE = https://github.com/royhills/arp-scan/releases/download/$(ARP_SCAN_VERSION)
Modified: branches/1.0/package/htop/Config.in
===================================================================
--- branches/1.0/package/htop/Config.in 2016-02-18 23:31:57 UTC (rev 7542)
+++ branches/1.0/package/htop/Config.in 2016-02-19 01:11:46 UTC (rev 7543)
@@ -5,4 +5,4 @@
htop is an interactive text-mode process viewer for Linux.
It aims to be a better top.
- http://htop.sf.net
+ http://hisham.hm/htop/
Modified: branches/1.0/package/htop/htop.mk
===================================================================
--- branches/1.0/package/htop/htop.mk 2016-02-18 23:31:57 UTC (rev 7542)
+++ branches/1.0/package/htop/htop.mk 2016-02-19 01:11:46 UTC (rev 7543)
@@ -4,10 +4,25 @@
#
#############################################################
-HTOP_VERSION = 0.9
+HTOP_VERSION = 1.0.3
HTOP_SOURCE = htop-$(HTOP_VERSION).tar.gz
-HTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/htop/$(HTOP_VERSION)
+HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION)
HTOP_DEPENDENCIES = ncurses
HTOP_AUTORECONF = YES
+HTOP_CONF_OPT = \
+ --disable-unicode
+
+HTOP_CONF_ENV = \
+ ac_cv_file__proc_stat=yes \
+ ac_cv_file__proc_meminfo=yes
+
+define HTOP_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/htop $(TARGET_DIR)/usr/bin/htop
+endef
+
+define HTOP_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/htop
+endef
+
$(eval $(call AUTOTARGETS,package,htop))
Deleted: branches/1.0/package/htop/htop.patch
===================================================================
--- branches/1.0/package/htop/htop.patch 2016-02-18 23:31:57 UTC (rev 7542)
+++ branches/1.0/package/htop/htop.patch 2016-02-19 01:11:46 UTC (rev 7543)
@@ -1,75 +0,0 @@
-# This patch removes the hard dependency on backtrace by checking for
-# it at compile time and adds a cross-compile /proc check.
-# Patch given to me by Hisham <his...@gm...> (htop-general)
-#
-# This patch is taken from upstream svn (r213, r215)
-#
-# Signed-off-by: Andy Kennedy <And...@ad...>
-diff -Naur a/CRT.c b/CRT.c
---- a/CRT.c 2010-11-23 09:56:32.000000000 -0600
-+++ b/CRT.c 2011-03-21 17:08:21.000000000 -0500
-@@ -11,7 +11,9 @@
- #include <signal.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
-
- #include "String.h"
-
-@@ -125,12 +127,14 @@
- CRT_done();
- #if __linux
- fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://htop.sf.net\n");
-- #else
-- fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n");
-- #endif
-+ #ifdef HAVE_EXECINFO_H
- size_t size = backtrace(backtraceArray, sizeof(backtraceArray));
- fprintf(stderr, "Backtrace: \n");
- backtrace_symbols_fd(backtraceArray, size, 2);
-+ #endif
-+ #else
-+ fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n");
-+ #endif
- abort();
- }
-
-diff -Naur a/CRT.h b/CRT.h
---- a/CRT.h 2010-11-23 09:56:32.000000000 -0600
-+++ b/CRT.h 2011-03-21 17:06:16.000000000 -0500
-@@ -14,7 +14,9 @@
- #include <signal.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
-
- #include "String.h"
-
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2010-11-23 09:56:32.000000000 -0600
-+++ b/configure.ac 2011-03-21 17:06:16.000000000 -0500
-@@ -25,6 +25,7 @@
- AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[
- missing_headers="$missing_headers $ac_header"
- ])
-+AC_CHECK_HEADERS([execinfo.h],[:],[:])
-
- # Checks for typedefs, structures, and compiler characteristics.
- AC_HEADER_STDBOOL
-@@ -99,10 +100,10 @@
- AC_MSG_ERROR([missing headers: $missing_headers])
- fi
-
--
--
-+if test "$cross_compiling" = "no"; then
- AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
- AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
-+fi
-
- AC_ARG_ENABLE(plpa, [AC_HELP_STRING([--enable-plpa], [enable PLPA support for CPU affinity])], ,enable_plpa="yes")
- PLPA_INCLUDED
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
