Accepting request 212304 from home:elvigia:branches:Base:System
- improve autools build, we do not want packages using, for example std=c99, instead determine the latest C standard with gnu extensions using autoconf macros. (htop-stdgnu.patch) OBS-URL: https://build.opensuse.org/request/show/212304 OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=23
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
03c68cfc68
commit
f9bc6f39f4
138
htop-stdgnu.patch
Normal file
138
htop-stdgnu.patch
Normal file
@ -0,0 +1,138 @@
|
||||
--- htop-1.0.2.orig/configure.ac
|
||||
+++ htop-1.0.2/configure.ac
|
||||
@@ -1,11 +1,12 @@
|
||||
# -*- Autoconf -*-
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
-AC_PREREQ(2.65)
|
||||
+AC_PREREQ([2.60])
|
||||
AC_INIT([htop],[1.0.2],[loderunner@users.sourceforge.net])
|
||||
|
||||
# The following two lines are required by hwloc scripts
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
+AC_SYS_LARGEFILE
|
||||
AC_CANONICAL_TARGET
|
||||
|
||||
AM_INIT_AUTOMAKE([1.11])
|
||||
@@ -14,15 +15,15 @@ AC_CONFIG_HEADER([config.h])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
# Checks for programs.
|
||||
-AC_PROG_CC
|
||||
+AC_PROG_CC_STDC
|
||||
AM_PROG_CC_C_O
|
||||
|
||||
-AC_DISABLE_SHARED
|
||||
-AC_ENABLE_STATIC
|
||||
-AC_PROG_LIBTOOL
|
||||
+#AC_DISABLE_SHARED
|
||||
+#AC_ENABLE_STATIC
|
||||
+#LT_INIT
|
||||
|
||||
-# Checks for libraries.
|
||||
-AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"])
|
||||
+
|
||||
+AC_SEARCH_LIBS([ceil], [m])
|
||||
|
||||
# Checks for header files.
|
||||
AC_HEADER_DIRENT
|
||||
@@ -30,7 +31,7 @@ AC_HEADER_STDC
|
||||
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],[:],[:])
|
||||
+AC_CHECK_HEADERS_ONCE([execinfo.h])
|
||||
|
||||
# Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_HEADER_STDBOOL
|
||||
@@ -40,17 +41,9 @@ AC_TYPE_UID_T
|
||||
|
||||
# Checks for library functions.
|
||||
AC_FUNC_CLOSEDIR_VOID
|
||||
-AC_TYPE_SIGNAL
|
||||
-AC_FUNC_STAT
|
||||
-AC_CHECK_FUNCS([memmove strncasecmp strstr strdup])
|
||||
|
||||
-save_cflags="${CFLAGS}"
|
||||
-CFLAGS="${CFLAGS} -std=c99"
|
||||
-AC_MSG_CHECKING([whether gcc -std=c99 option works])
|
||||
-AC_TRY_COMPILE(AC_INCLUDES_DEFAULT, [char *a; a = strdup("foo"); int i = 0; i++; // C99],
|
||||
- AC_MSG_RESULT([yes]),
|
||||
- AC_MSG_ERROR([htop is written in C99. A newer version of gcc is required.]))
|
||||
-CFLAGS="$save_cflags"
|
||||
+AC_FUNC_STAT
|
||||
+AC_CHECK_FUNCS_ONCE([memmove strncasecmp strstr strdup])
|
||||
|
||||
PROCDIR=/proc
|
||||
AC_ARG_WITH(proc, [ --with-proc=DIR Location of a Linux-compatible proc filesystem (default=/proc).],
|
||||
@@ -61,33 +54,33 @@ AC_ARG_WITH(proc, [ --with-proc=DIR
|
||||
fi,
|
||||
AC_DEFINE(PROCDIR, "/proc", [Path of proc filesystem]))
|
||||
|
||||
-AC_ARG_ENABLE(openvz, [AC_HELP_STRING([--enable-openvz], [enable OpenVZ support])], ,enable_openvz="no")
|
||||
+AC_ARG_ENABLE(openvz, [AS_HELP_STRING([--enable-openvz],[enable OpenVZ support])], ,enable_openvz="no")
|
||||
if test "x$enable_openvz" = xyes; then
|
||||
AC_DEFINE(HAVE_OPENVZ, 1, [Define if openvz support enabled.])
|
||||
fi
|
||||
|
||||
-AC_ARG_ENABLE(cgroup, [AC_HELP_STRING([--enable-cgroup], [enable cgroups support])], ,enable_cgroup="no")
|
||||
+AC_ARG_ENABLE(cgroup, [AS_HELP_STRING([--enable-cgroup],[enable cgroups support])], ,enable_cgroup="no")
|
||||
if test "x$enable_cgroup" = xyes; then
|
||||
AC_DEFINE(HAVE_CGROUP, 1, [Define if cgroup support enabled.])
|
||||
fi
|
||||
|
||||
-AC_ARG_ENABLE(vserver, [AC_HELP_STRING([--enable-vserver], [enable VServer support])], ,enable_vserver="no")
|
||||
+AC_ARG_ENABLE(vserver, [AS_HELP_STRING([--enable-vserver],[enable VServer support])], ,enable_vserver="no")
|
||||
if test "x$enable_vserver" = xyes; then
|
||||
AC_DEFINE(HAVE_VSERVER, 1, [Define if vserver support enabled.])
|
||||
fi
|
||||
|
||||
-AC_ARG_ENABLE(ancient_vserver, [AC_HELP_STRING([--enable-ancient-vserver], [enable ancient VServer support (implies --enable-vserver)])], ,enable_ancient_vserver="no")
|
||||
+AC_ARG_ENABLE(ancient_vserver, [AS_HELP_STRING([--enable-ancient-vserver],[enable ancient VServer support (implies --enable-vserver)])], ,enable_ancient_vserver="no")
|
||||
if test "x$enable_ancient_vserver" = xyes; then
|
||||
AC_DEFINE(HAVE_VSERVER, 1, [Define if vserver support enabled.])
|
||||
AC_DEFINE(HAVE_ANCIENT_VSERVER, 1, [Define if ancient vserver support enabled.])
|
||||
fi
|
||||
|
||||
-AC_ARG_ENABLE(taskstats, [AC_HELP_STRING([--enable-taskstats], [enable per-task IO Stats (taskstats kernel sup required)])], ,enable_taskstats="yes")
|
||||
+AC_ARG_ENABLE(taskstats, [AS_HELP_STRING([--enable-taskstats],[enable per-task IO Stats (taskstats kernel sup required)])], ,enable_taskstats="yes")
|
||||
if test "x$enable_taskstats" = xyes; then
|
||||
AC_DEFINE(HAVE_TASKSTATS, 1, [Define if taskstats support enabled.])
|
||||
fi
|
||||
|
||||
-AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
|
||||
+AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode],[enable Unicode support])], ,enable_unicode="yes")
|
||||
if test "x$enable_unicode" = xyes; then
|
||||
AC_CHECK_LIB([ncursesw], [refresh], [], [
|
||||
missing_libraries="$missing_libraries libncursesw"
|
||||
@@ -113,7 +106,7 @@ AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERRO
|
||||
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(native_affinity, [AC_HELP_STRING([--enable-native-affinity], [enable native sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_native_affinity="yes")
|
||||
+AC_ARG_ENABLE(native_affinity, [AS_HELP_STRING([--enable-native-affinity],[enable native sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_native_affinity="yes")
|
||||
if test "x$enable_native_affinity" = xyes -a "x$cross_compiling" = xno; then
|
||||
AC_MSG_CHECKING([for usable sched_setaffinity])
|
||||
AC_RUN_IFELSE([
|
||||
@@ -134,7 +127,7 @@ if test "x$enable_native_affinity" = xye
|
||||
AC_DEFINE(HAVE_NATIVE_AFFINITY, 1, [Define if native sched_setaffinity and sched_getaffinity are to be used.])
|
||||
fi
|
||||
|
||||
-AC_ARG_ENABLE(hwloc, [AC_HELP_STRING([--enable-hwloc], [enable hwloc support for CPU affinity])],, enable_hwloc="no")
|
||||
+AC_ARG_ENABLE(hwloc, [AS_HELP_STRING([--enable-hwloc],[enable hwloc support for CPU affinity])],, enable_hwloc="no")
|
||||
if test "x$enable_hwloc" = xyes
|
||||
then
|
||||
AC_CHECK_LIB([hwloc], [hwloc_linux_get_tid_cpubind], [], [missing_libraries="$missing_libraries libhwloc"])
|
||||
--- htop-1.0.2.orig/Makefile.am
|
||||
+++ htop-1.0.2/Makefile.am
|
||||
@@ -10,8 +10,8 @@ applications_DATA = htop.desktop
|
||||
pixmapdir = $(datadir)/pixmaps
|
||||
pixmap_DATA = htop.png
|
||||
|
||||
-htop_CFLAGS = -pedantic -Wall -Wextra -std=c99 -rdynamic -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\"
|
||||
-AM_CPPFLAGS = -DNDEBUG
|
||||
+htop_CFLAGS = -Wall -Wextra -DSYSCONFDIR=\"$(sysconfdir)\"
|
||||
+AM_CPPFLAGS = -include config.h -DNDEBUG
|
||||
|
||||
myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
|
||||
ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c \
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 26 21:02:27 UTC 2013 - crrodriguez@opensuse.org
|
||||
|
||||
- improve autools build, we do not want packages
|
||||
using, for example std=c99, instead determine the
|
||||
latest C standard with gnu extensions using autoconf macros.
|
||||
(htop-stdgnu.patch)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 26 13:28:46 UTC 2013 - jengelh@inai.de
|
||||
|
||||
|
||||
@ -26,7 +26,9 @@ Url: http://htop.sourceforge.net
|
||||
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch0: htop-desktop-file-fix-thoenig-01.patch
|
||||
Patch1: htop-stdgnu.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: automake
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: python
|
||||
BuildRequires: update-desktop-files
|
||||
@ -48,10 +50,12 @@ Authors:
|
||||
%prep
|
||||
%setup
|
||||
%patch0 -p0
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags} `ncursesw6-config --cflags`"
|
||||
export LDFLAGS="`ncursesw6-config --libs`"
|
||||
autoreconf -fiv
|
||||
%configure \
|
||||
--enable-unicode \
|
||||
--enable-taskstats \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user