Commit f7cdf847 authored by Michael Ott's avatar Michael Ott
Browse files

Remove ncurses dependency of OpenIPMI

parent b8add43e
......@@ -6,7 +6,6 @@ DISTFILES = thrift-0.9.1.tar.gz;https://dist.apache.org/repos/dist/release/thrif
mosquitto-1.1.3.tar.gz;http://mosquitto.org/files/source/mosquitto-1.1.3.tar.gz \
rudeconfig-5.0.5.tar.gz;http://rudeserver.com/config/download/rudeconfig-5.0.5.tar.gz \
popt-1.16.tar.gz;http://rpm5.org/files/popt/popt-1.16.tar.gz \
ncurses-5.9.tar.gz;http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz \
OpenIPMI-2.0.19.tar.gz;http://optimate.dl.sourceforge.net/project/openipmi/OpenIPMI%202.0%20Library/OpenIPMI-2.0.19.tar.gz \
boost_1_55_0.tar.gz;http://netcologne.dl.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.gz
FETCH = wget -c --no-check-certificate -O -
......@@ -23,7 +22,7 @@ CASSANDRA_COMMITLOG_SEGMENT_SIZE_IN_MB = 16
DISTFILESNAMES = $(foreach f,$(DISTFILES),$(shell echo "$(f)" | sed 's/;.*//'))
DISTFILESPATHS = $(foreach f,$(DISTFILES),$(shell echo "$(f)" | sed 's/.tar.gz;.*//'))
CFLAGS += -I$(DCDBDEPLOYPATH)/include -I$(DCDBDEPLOYPATH)/include/ncurses -O0 -g
CFLAGS += -I$(DCDBDEPLOYPATH)/include -O0 -g
CXX11FLAGS = --std=c++11
LDFLAGS += -L$(DCDBDEPLOYPATH)/lib -O0 -g
......@@ -92,17 +91,11 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles
$(eval P := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*popt/popt/' | sed 's/\ .*//'))
@cd $(DCDBDEPSPATH)/$(P) && ./configure --prefix=$(DCDBDEPLOYPATH) && make -j $(MAKETHREADS) && make install
@echo ""
@echo "Buidling Ncurses library..."
$(eval N := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*ncurses/ncurses/' | sed 's/\ .*//'))
@if [ -e $(DCDBDEPSPATH)/patches/$(N).patch ]; then echo "Patching Ncurses..."; cd $(DCDBDEPSPATH)/$(N) && (patch -N -p1 < $(DCDBDEPSPATH)/patches/$(N).patch || true); fi
@cd $(DCDBDEPSPATH)/$(N) && ./configure --prefix=$(DCDBDEPLOYPATH) --with-shared --without-ada --without-manpages \
--without-progs --without-tests && make -j $(MAKETHREADS) && make install
@echo ""
@echo "Buidling OpenIPMI library..."
$(eval O := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*OpenIPMI/OpenIPMI/' | sed 's/\ .*//'))
@cd $(DCDBDEPSPATH)/$(O) && env CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=$(DCDBDEPLOYPATH) --with-swig=no --with-perl=no --with-python-no
@if [ -e $(DCDBDEPSPATH)/patches/$(O).patch ]; then echo "Patching OpenIPMI..."; cd $(DCDBDEPSPATH)/$(O) && (patch -N -p1 < $(DCDBDEPSPATH)/patches/$(O).patch || true); fi
@cd $(DCDBDEPSPATH)/$(O) && env CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=$(DCDBDEPLOYPATH) --with-swig=no --with-perl=no --with-python=no
@if [ `uname` == "Darwin" ]; then echo "Fixing OpenIPMI for Mac OS..."; cd $(DCDBDEPSPATH)/$(O) && find . -name 'Makefile*' | xargs sed -i '' -e 's/Map/map/g'; fi
@cd $(DCDBDEPSPATH)/$(O) && env CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" make -j $(MAKETHREADS) && make install
......
diff -r -U3 OpenIPMI-2.0.19/configure.in OpenIPMI-2.0.19-patched/configure.in
--- OpenIPMI-2.0.19/configure.in 2013-11-29 11:28:01.362385975 +0100
+++ OpenIPMI-2.0.19-patched/configure.in 2013-11-29 10:36:00.508961345 +0100
@@ -841,62 +841,11 @@
AC_SUBST(BIBTEX)
AC_SUBST(DVIPDF)
-OPENIPMI_SWIG_LIBS="${PYTHON_POSIX_LIB} \$(top_builddir)/lib/libOpenIPMI.la \$(top_builddir)/utils/libOpenIPMIutils.la \$(top_builddir)/cmdlang/libOpenIPMIcmdlang.la ${GLIB_SINGLE_LIB} ${TCL_LIB}"
-OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\$(top_builddir)/utils/.libs/libOpenIPMIutils.so:\$(top_builddir)/cmdlang/.libs/libOpenIPMIcmdlang.so:${GLIB_SINGLE_SO}:${TCL_SO}"
+OPENIPMI_SWIG_LIBS="${PYTHON_POSIX_LIB} \$(top_builddir)/lib/libOpenIPMI.la \$(top_builddir)/utils/libOpenIPMIutils.la ${GLIB_SINGLE_LIB} ${TCL_LIB}"
+OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\$(top_builddir)/utils/.libs/libOpenIPMIutils.so:\${GLIB_SINGLE_SO}:${TCL_SO}"
AC_SUBST(OPENIPMI_SWIG_LIBS)
AC_SUBST(OPENIPMI_SWIG_SO)
-# Everything from here to AC_OUTPUT is for libedit
-
-# AC_PROG_LIBTOOL runs AC_CANONICAL_HOST
-case $host in
- *-sun-*) AC_DEFINE([_SUNOS], [], [Solaris's term.h does horrid things.]);;
-esac
-
-AC_CHECK_LIB(curses, tgetent, TERM_LIBS=-lcurses,
- [AC_CHECK_LIB(ncursesw, tgetent, TERM_LIBS=-lncursesw,
- [AC_CHECK_LIB(ncurses, tgetent, TERM_LIBS=-lncurses,
- [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])])] )] )
-
-# Checks for header files.
-AC_FUNC_ALLOCA
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h termios.h unistd.h curses.h ncurses.h sys/cdefs.h])
-
-## include curses.h to prevent "Present But Cannot Be Compiled"
-AC_CHECK_HEADERS([term.h],,,
-[[#if HAVE_CURSES_H
-# include <curses.h>
-#elif HAVE_NCURSES_H
-# include <ncurses.h>
-#endif
-]])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_CHECK_TYPES([u_int32_t])
-
-# Checks for library functions.
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_FORK
-AC_CHECK_FUNCS(strlcpy strlcat fgetln)
-AC_PROG_GCC_TRADITIONAL
-## _AIX is offended by rpl_malloc and rpl_realloc
-#AC_FUNC_MALLOC
-#AC_FUNC_REALLOC
-AC_TYPE_SIGNAL
-AC_FUNC_STAT
-AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid])
-EL_GETPW_R_POSIX
-EL_GETPW_R_DRAFT
-AC_SUBST(TERM_LIBS)
-
-# End of libedit inclusions
-
AC_OUTPUT(Makefile
utils/Makefile
lib/Makefile
@@ -913,8 +862,6 @@
swig/perl/Makefile
swig/python/Makefile
swig/python/openipmigui/Makefile
- libedit/Makefile
- cmdlang/Makefile
include/Makefile
include/OpenIPMI/Makefile
include/OpenIPMI/ipmiif.h
@@ -928,5 +875,4 @@
OpenIPMIglib.pc
OpenIPMIglib12.pc
OpenIPMItcl.pc
- OpenIPMIcmdlang.pc
OpenIPMIui.pc)
Only in OpenIPMI-2.0.19: configure.in.orig
Only in OpenIPMI-2.0.19: configure.in.rej
diff -r -U3 OpenIPMI-2.0.19/Makefile.am OpenIPMI-2.0.19-patched/Makefile.am
--- OpenIPMI-2.0.19/Makefile.am 2011-10-12 17:05:09.000000000 +0200
+++ OpenIPMI-2.0.19-patched/Makefile.am 2013-11-29 10:36:05.004899680 +0100
@@ -2,16 +2,16 @@
RPMFLAGS = -ta
SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
- ui lanserv sample doc man $(SWIG_DIR)
+ lanserv doc man $(SWIG_DIR)
DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+ lanserv doc man swig
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
OpenIPMI.spec ipmi.init ipmi.sysconf COPYING.BSD \
CONFIGURING_FOR_LAN
-PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIui.pc OpenIPMIposix.pc \
+PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIposix.pc \
OpenIPMIpthread.pc OpenIPMIcmdlang.pc $(GLIB_PKGCONF) \
$(GLIB12_PKGCONF) $(TCL_PKGCONF)
@@ -29,11 +29,11 @@
rpm: dist
$(RPM) $(RPMFLAGS) $(distdir).tar.gz < /dev/null
-PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui
+PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs
rungui:
LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) $(top_srcdir)/swig/python/openipmigui.py
DISTCLEANFILES=OpenIPMI.spec OpenIPMIcmdlang.pc OpenIPMI.pc OpenIPMItcl.pc \
- OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
+ OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIglib.pc \
OpenIPMIpthread.pc OpenIPMIutils.pc
diff -r -U3 OpenIPMI-2.0.19/Makefile.in OpenIPMI-2.0.19-patched/Makefile.in
--- OpenIPMI-2.0.19/Makefile.in 2011-10-12 17:35:10.000000000 +0200
+++ OpenIPMI-2.0.19-patched/Makefile.in 2013-11-29 10:36:05.004899680 +0100
@@ -37,7 +37,7 @@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/OpenIPMI.pc.in \
- $(srcdir)/OpenIPMI.spec.in $(srcdir)/OpenIPMIcmdlang.pc.in \
+ $(srcdir)/OpenIPMI.spec.in \
$(srcdir)/OpenIPMIglib.pc.in $(srcdir)/OpenIPMIglib12.pc.in \
$(srcdir)/OpenIPMIposix.pc.in $(srcdir)/OpenIPMIpthread.pc.in \
$(srcdir)/OpenIPMItcl.pc.in $(srcdir)/OpenIPMIui.pc.in \
@@ -58,7 +58,7 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = OpenIPMI.spec OpenIPMIutils.pc OpenIPMI.pc \
OpenIPMIpthread.pc OpenIPMIposix.pc OpenIPMIglib.pc \
- OpenIPMIglib12.pc OpenIPMItcl.pc OpenIPMIcmdlang.pc \
+ OpenIPMIglib12.pc OpenIPMItcl.pc \
OpenIPMIui.pc
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
@@ -228,7 +228,6 @@
TCL_PKGCONF = @TCL_PKGCONF@
TCL_SO = @TCL_SO@
TCL_TARGET = @TCL_TARGET@
-TERM_LIBS = @TERM_LIBS@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -294,23 +293,23 @@
top_srcdir = @top_srcdir@
RPM = rpmbuild
RPMFLAGS = -ta
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
- ui lanserv sample doc man $(SWIG_DIR)
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) \
+ lanserv doc man $(SWIG_DIR)
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+DIST_SUBDIRS = include utils lib unix glib tcl \
+ lanserv doc man swig
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
OpenIPMI.spec ipmi.init ipmi.sysconf COPYING.BSD \
CONFIGURING_FOR_LAN
-PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIui.pc OpenIPMIposix.pc \
- OpenIPMIpthread.pc OpenIPMIcmdlang.pc $(GLIB_PKGCONF) \
+PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIposix.pc \
+ OpenIPMIpthread.pc $(GLIB_PKGCONF) \
$(GLIB12_PKGCONF) $(TCL_PKGCONF)
ACLOCAL_AMFLAGS = -I m4
PYPATH = $(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui
-DISTCLEANFILES = OpenIPMI.spec OpenIPMIcmdlang.pc OpenIPMI.pc OpenIPMItcl.pc \
+DISTCLEANFILES = OpenIPMI.spec OpenIPMI.pc OpenIPMItcl.pc \
OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
OpenIPMIpthread.pc OpenIPMIutils.pc
@@ -385,8 +384,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
OpenIPMItcl.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMItcl.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-OpenIPMIcmdlang.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMIcmdlang.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
OpenIPMIui.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMIui.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
Only in ncurses-5.9-proper: .dirstamp
diff -r -U3 ncurses-5.9/c++/cursesf.h ncurses-5.9-proper/c++/cursesf.h
--- ncurses-5.9/c++/cursesf.h 2005-08-13 20:08:24.000000000 +0200
+++ ncurses-5.9-proper/c++/cursesf.h 2013-10-29 15:53:11.000000000 +0100
@@ -681,7 +681,7 @@
const T* p_UserData = STATIC_CAST(T*)(0),
bool with_frame=FALSE,
bool autoDelete_Fields=FALSE)
- : NCursesForm (Fields, with_frame, autoDelete_Fields) {
+ : NCursesForm (&Fields, with_frame, autoDelete_Fields) {
if (form)
set_user (const_cast<void *>(p_UserData));
};
@@ -694,7 +694,7 @@
const T* p_UserData = STATIC_CAST(T*)(0),
bool with_frame=FALSE,
bool autoDelete_Fields=FALSE)
- : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
+ : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x,
with_frame, autoDelete_Fields) {
if (form)
set_user (const_cast<void *>(p_UserData));
diff -r -U3 ncurses-5.9/c++/cursesm.h ncurses-5.9-proper/c++/cursesm.h
--- ncurses-5.9/c++/cursesm.h 2005-08-13 20:10:36.000000000 +0200
+++ ncurses-5.9-proper/c++/cursesm.h 2013-10-29 15:53:21.000000000 +0100
@@ -639,7 +639,7 @@
const T* p_UserData = STATIC_CAST(T*)(0),
bool with_frame=FALSE,
bool autoDelete_Items=FALSE)
- : NCursesMenu (Items, with_frame, autoDelete_Items) {
+ : NCursesMenu (&Items, with_frame, autoDelete_Items) {
if (menu)
set_user (const_cast<void *>(p_UserData));
};
@@ -651,7 +651,7 @@
int begin_x = 0,
const T* p_UserData = STATIC_CAST(T*)(0),
bool with_frame=FALSE)
- : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
+ : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) {
if (menu)
set_user (const_cast<void *>(p_UserData));
};
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment