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

Removed popt dependency from OpenIPMI

parent 088f5f53
......@@ -5,7 +5,6 @@ DISTFILES = thrift-0.9.1.tar.gz;https://dist.apache.org/repos/dist/release/thrif
apache-cassandra-1.2.12.tar.gz;http://mirror.netcologne.de/apache.org/cassandra/1.2.12/apache-cassandra-1.2.12-bin.tar.gz \
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 \
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 -
......@@ -87,18 +86,13 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles
@cd $(DCDBDEPSPATH)/$(R) && ./configure --prefix=$(DCDBDEPLOYPATH) && make -j $(MAKETHREADS) && chmod +x install-sh && make install
@echo ""
@echo "Buidling Popt library..."
$(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 OpenIPMI library..."
@echo "Building OpenIPMI library..."
$(eval O := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*OpenIPMI/OpenIPMI/' | sed 's/\ .*//'))
@if [ -e $(DCDBDEPSPATH)/patches/$(O).patch ]; then echo "Patching OpenIPMI..."; cd $(DCDBDEPSPATH)/$(O) && (patch -N -p1 < $(DCDBDEPSPATH)/patches/$(O).patch || true); fi
$(eval X := $(shell uname))
@if [ "$(X)" = "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)" ./configure --prefix=$(DCDBDEPLOYPATH) --with-swig=no --with-perl=no --with-python=no
@cd $(DCDBDEPSPATH)/$(O) && env CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" make -j $(MAKETHREADS) && make install
@cd $(DCDBDEPSPATH)/$(O) && ./configure --prefix=$(DCDBDEPLOYPATH) --with-swig=no --with-perl=no --with-python=no
@cd $(DCDBDEPSPATH)/$(O) && make -j $(MAKETHREADS) && make install
@echo ""
@echo "Building Boost..."
......
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 @@
--- OpenIPMI-2.0.19/configure.in 2011-10-12 17:34:43.000000000 +0200
+++ OpenIPMI-2.0.19-patched/configure.in 2013-12-04 11:49:00.560170498 +0100
@@ -51,18 +51,6 @@
SNMPLIBS="$withval"
)
-POPTCFLAGS=
-AC_ARG_WITH(poptflags,
-[ --with-poptflags=flags Set the flags to compile with popt.],
- CPPFLAGS="$withval $CPPFLAGS"
-)
-
-POPTCFLAGS=
-AC_ARG_WITH(poptlibs,
-[ --with-poptlibs=libs Set the libraries to link with popt.],
- POPTLIBS="$withval"
-)
-
# If UCD SNMP requires OpenSSL, this tells where to find the crypto lib
tryopenssl=yes
AC_ARG_WITH(openssl,
@@ -280,23 +268,6 @@
AC_SUBST(OPENIPMI_VERSION_RELEASE)
AC_SUBST(OPENIPMI_VERSION_EXTRA)
-AC_SUBST(POPTLIBS)
-
-FOUND_POPT_HEADER=no
-AC_CHECK_HEADER(popt.h, FOUND_POPT_HEADER=yes; )
-if test "x$FOUND_POPT_HEADER" != "xyes"; then
- echo "Could not find headers for the popt library"
- exit 1
-fi
-
-if test "x$POPTLIBS" = "x"; then
- AC_CHECK_LIB(popt, poptHelpOptions, POPTLIBS=-lpopt)
- if test "x$POPTLIBS" = ""; then
- echo "Could not find the popt library"
- exit 1
- fi
-fi
-
# Check for GDBM
have_gdbm_h="no"
GDBM_LIB=
@@ -841,62 +812,11 @@
AC_SUBST(BIBTEX)
AC_SUBST(DVIPDF)
......@@ -66,7 +109,7 @@ diff -r -U3 OpenIPMI-2.0.19/configure.in OpenIPMI-2.0.19-patched/configure.in
AC_OUTPUT(Makefile
utils/Makefile
lib/Makefile
@@ -913,8 +862,6 @@
@@ -913,8 +833,6 @@
swig/perl/Makefile
swig/python/Makefile
swig/python/openipmigui/Makefile
......@@ -75,7 +118,8 @@ diff -r -U3 OpenIPMI-2.0.19/configure.in OpenIPMI-2.0.19-patched/configure.in
include/Makefile
include/OpenIPMI/Makefile
include/OpenIPMI/ipmiif.h
@@ -928,5 +875,3 @@
@@ -927,6 +845,4 @@
OpenIPMIposix.pc
OpenIPMIglib.pc
OpenIPMIglib12.pc
- OpenIPMItcl.pc
......@@ -84,17 +128,17 @@ diff -r -U3 OpenIPMI-2.0.19/configure.in OpenIPMI-2.0.19-patched/configure.in
+ OpenIPMItcl.pc)
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
+++ OpenIPMI-2.0.19-patched/Makefile.am 2013-12-04 11:46:09.384924417 +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)
+ doc man $(SWIG_DIR)
DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+ lanserv doc man swig
+ doc man swig
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
OpenIPMI.spec ipmi.init ipmi.sysconf COPYING.BSD \
......@@ -121,7 +165,7 @@ diff -r -U3 OpenIPMI-2.0.19/Makefile.am OpenIPMI-2.0.19-patched/Makefile.am
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
+++ OpenIPMI-2.0.19-patched/Makefile.in 2013-12-04 11:49:07.712180765 +0100
@@ -37,7 +37,7 @@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
......@@ -140,7 +184,15 @@ diff -r -U3 OpenIPMI-2.0.19/Makefile.in OpenIPMI-2.0.19-patched/Makefile.in
OpenIPMIui.pc
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
@@ -228,7 +228,6 @@
@@ -204,7 +204,6 @@
PERL_INSTALL_DIR = @PERL_INSTALL_DIR@
PERL_POSIX_LIB = @PERL_POSIX_LIB@
PERL_POSIX_SO = @PERL_POSIX_SO@
-POPTLIBS = @POPTLIBS@
PYTHON_CFLAGS = @PYTHON_CFLAGS@
PYTHON_DIR = @PYTHON_DIR@
PYTHON_GUI_DIR = @PYTHON_GUI_DIR@
@@ -228,7 +227,6 @@
TCL_PKGCONF = @TCL_PKGCONF@
TCL_SO = @TCL_SO@
TCL_TARGET = @TCL_TARGET@
......@@ -148,19 +200,19 @@ diff -r -U3 OpenIPMI-2.0.19/Makefile.in OpenIPMI-2.0.19-patched/Makefile.in
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -294,23 +293,23 @@
@@ -294,23 +292,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)
+ 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
+ doc man swig
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
OpenIPMI.spec ipmi.init ipmi.sysconf COPYING.BSD \
......@@ -179,7 +231,7 @@ diff -r -U3 OpenIPMI-2.0.19/Makefile.in OpenIPMI-2.0.19-patched/Makefile.in
OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
OpenIPMIpthread.pc OpenIPMIutils.pc
@@ -385,8 +384,6 @@
@@ -385,8 +383,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
OpenIPMItcl.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMItcl.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
......@@ -188,19 +240,135 @@ diff -r -U3 OpenIPMI-2.0.19/Makefile.in OpenIPMI-2.0.19-patched/Makefile.in
OpenIPMIui.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMIui.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
--- OpenIPMI-2.0.19/configure 2013-12-04 10:07:19.009490540 +0100
+++ OpenIPMI-2.0.19-patched/configure 2013-12-04 10:30:34.611366280 +0100
@@ -12618,1332 +12618,13 @@
diff -r -U3 OpenIPMI-2.0.19/configure OpenIPMI-2.0.19-patched/configure
--- OpenIPMI-2.0.19/configure 2011-10-12 17:35:11.000000000 +0200
+++ OpenIPMI-2.0.19-patched/configure 2013-12-04 11:48:49.859155269 +0100
@@ -802,7 +802,6 @@
glibprog
pkgprog
GDBM_LIB
-POPTLIBS
OPENIPMI_VERSION_EXTRA
OPENIPMI_VERSION_RELEASE
OPENIPMI_VERSION_MINOR
@@ -923,8 +922,6 @@
with_ucdsnmp
with_snmpflags
with_snmplibs
-with_poptflags
-with_poptlibs
with_openssl
with_opensslflags
with_openssllibs
@@ -1599,8 +1596,6 @@
--with-ucdsnmp=PATH Look for ucdsnmp in PATH.
--with-snmpflags=flags Set the flags to compile with SNMP.
--with-snmplibs=libs Set the libraries to link with SNMP.
- --with-poptflags=flags Set the flags to compile with popt.
- --with-poptlibs=libs Set the libraries to link with popt.
--with-openssl[=yes|no|PATH] Look for openssl, with the optional path.
--with-opensslflags=flags Set the flags to compile with OpenSSL.
--with-openssllibs=libs Set the libraries to link with OpenSSL.
@@ -3152,24 +3147,6 @@
fi
-POPTCFLAGS=
-
-# Check whether --with-poptflags was given.
-if test "${with_poptflags+set}" = set; then :
- withval=$with_poptflags; CPPFLAGS="$withval $CPPFLAGS"
-
-fi
-
-
-POPTCFLAGS=
-
-# Check whether --with-poptlibs was given.
-if test "${with_poptlibs+set}" = set; then :
- withval=$with_poptlibs; POPTLIBS="$withval"
-
-fi
-
-
# If UCD SNMP requires OpenSSL, this tells where to find the crypto lib
tryopenssl=yes
-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}"
@@ -11229,65 +11206,6 @@
-FOUND_POPT_HEADER=no
-ac_fn_c_check_header_mongrel "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default"
-if test "x$ac_cv_header_popt_h" = x""yes; then :
- FOUND_POPT_HEADER=yes;
-fi
-
-
-if test "x$FOUND_POPT_HEADER" != "xyes"; then
- echo "Could not find headers for the popt library"
- exit 1
-fi
-
-if test "x$POPTLIBS" = "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poptHelpOptions in -lpopt" >&5
-$as_echo_n "checking for poptHelpOptions in -lpopt... " >&6; }
-if test "${ac_cv_lib_popt_poptHelpOptions+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpopt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char poptHelpOptions ();
-int
-main ()
-{
-return poptHelpOptions ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_popt_poptHelpOptions=yes
-else
- ac_cv_lib_popt_poptHelpOptions=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptHelpOptions" >&5
-$as_echo "$ac_cv_lib_popt_poptHelpOptions" >&6; }
-if test "x$ac_cv_lib_popt_poptHelpOptions" = x""yes; then :
- POPTLIBS=-lpopt
-fi
-
- if test "x$POPTLIBS" = ""; then
- echo "Could not find the popt library"
- exit 1
- fi
-fi
-
# Check for GDBM
have_gdbm_h="no"
GDBM_LIB=
@@ -12618,1329 +12536,10 @@
-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}"
-
-
-
-# Everything from here to AC_OUTPUT is for libedit
-
-# AC_PROG_LIBTOOL runs AC_CANONICAL_HOST
......@@ -1516,16 +1684,15 @@ diff -r -U3 OpenIPMI-2.0.19/Makefile.in OpenIPMI-2.0.19-patched/Makefile.in
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-
-
+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}"
-# End of libedit inclusions
-
ac_config_files="$ac_config_files Makefile utils/Makefile lib/Makefile unix/Makefile glib/Makefile tcl/Makefile ui/Makefile lanserv/Makefile lanserv/OpenIPMI/Makefile sample/Makefile doc/Makefile man/Makefile swig/Makefile swig/perl/Makefile swig/python/Makefile swig/python/openipmigui/Makefile libedit/Makefile cmdlang/Makefile include/Makefile include/OpenIPMI/Makefile include/OpenIPMI/ipmiif.h include/OpenIPMI/internal/Makefile include/linux/Makefile OpenIPMI.spec OpenIPMIutils.pc OpenIPMI.pc OpenIPMIpthread.pc OpenIPMIposix.pc OpenIPMIglib.pc OpenIPMIglib12.pc OpenIPMItcl.pc OpenIPMIcmdlang.pc OpenIPMIui.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -14935,8 +13614,6 @@
@@ -14935,8 +13534,6 @@
"swig/perl/Makefile") CONFIG_FILES="$CONFIG_FILES swig/perl/Makefile" ;;
"swig/python/Makefile") CONFIG_FILES="$CONFIG_FILES swig/python/Makefile" ;;
"swig/python/openipmigui/Makefile") CONFIG_FILES="$CONFIG_FILES swig/python/openipmigui/Makefile" ;;
......@@ -1534,7 +1701,7 @@ diff -r -U3 OpenIPMI-2.0.19/Makefile.in OpenIPMI-2.0.19-patched/Makefile.in
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"include/OpenIPMI/Makefile") CONFIG_FILES="$CONFIG_FILES include/OpenIPMI/Makefile" ;;
"include/OpenIPMI/ipmiif.h") CONFIG_FILES="$CONFIG_FILES include/OpenIPMI/ipmiif.h" ;;
@@ -14950,8 +13627,6 @@
@@ -14950,8 +13547,6 @@
"OpenIPMIglib.pc") CONFIG_FILES="$CONFIG_FILES OpenIPMIglib.pc" ;;
"OpenIPMIglib12.pc") CONFIG_FILES="$CONFIG_FILES OpenIPMIglib12.pc" ;;
"OpenIPMItcl.pc") CONFIG_FILES="$CONFIG_FILES OpenIPMItcl.pc" ;;
......@@ -1543,3 +1710,4 @@ diff -r -U3 OpenIPMI-2.0.19/Makefile.in OpenIPMI-2.0.19-patched/Makefile.in
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
Supports Markdown
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