Commit 111f7f82 authored by Axel Auweter's avatar Axel Auweter
Browse files

Fix x86_64 builds after changes for the ARM cross build broke it (#30).

parent 26361b6c
......@@ -28,7 +28,7 @@ FETCH = wget -c --no-check-certificate -O -
ifeq ("$(ARCH)", "arm")
OPENSSL_TARGET = "linux-armv4"
else
OPENSSL_TARGET = $(findstring $(shell uname),Darwin),"darwin64-x86_64-cc","linux-x86_64")
OPENSSL_TARGET = $(if $(findstring $(shell uname),Darwin),"darwin64-x86_64-cc","linux-x86_64")
endif
MAKETHREADS ?= $(if $(findstring $(shell uname),Darwin),$(shell sysctl machdep.cpu.thread_count | cut -b 27-),\
......
diff -ru OpenIPMI-2.0.21/configure OpenIPMI-2.0.21-patched/configure
--- OpenIPMI-2.0.21/configure 2014-01-28 20:35:11.000000000 +0100
+++ OpenIPMI-2.0.21-patched/configure 2015-04-07 15:15:50.409961967 +0200
+++ OpenIPMI-2.0.21-patched/configure 2015-04-08 11:37:34.225967045 +0200
@@ -825,8 +825,6 @@
with_ucdsnmp
with_snmpflags
......@@ -109,10 +109,15 @@ diff -ru OpenIPMI-2.0.21/configure OpenIPMI-2.0.21-patched/configure
# Check for GDBM
have_gdbm_h="no"
GDBM_LIB=
@@ -13733,1333 +13653,6 @@
@@ -13728,1338 +13648,11 @@
-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
......@@ -1436,16 +1441,52 @@ diff -ru OpenIPMI-2.0.21/configure OpenIPMI-2.0.21-patched/configure
-fi
-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
if test "${build}" != "${host}" ; then
for ac_prog in ${build_alias}-gcc ${build}-gcc gcc
@@ -15109,7 +13702,7 @@
fi
-ac_config_files="$ac_config_files Makefile utils/Makefile lib/Makefile unix/Makefile glib/Makefile tcl/Makefile ui/Makefile lanserv/Makefile lanserv/OpenIPMI/Makefile lanserv/sdrcomp/Makefile lanserv/marvell-bmc/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"
+ac_config_files="$ac_config_files Makefile utils/Makefile lib/Makefile unix/Makefile glib/Makefile tcl/Makefile ui/Makefile lanserv/Makefile lanserv/OpenIPMI/Makefile lanserv/sdrcomp/Makefile lanserv/marvell-bmc/Makefile doc/Makefile man/Makefile swig/Makefile swig/perl/Makefile swig/python/Makefile swig/python/openipmigui/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"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -16127,15 +14720,12 @@
"lanserv/OpenIPMI/Makefile") CONFIG_FILES="$CONFIG_FILES lanserv/OpenIPMI/Makefile" ;;
"lanserv/sdrcomp/Makefile") CONFIG_FILES="$CONFIG_FILES lanserv/sdrcomp/Makefile" ;;
"lanserv/marvell-bmc/Makefile") CONFIG_FILES="$CONFIG_FILES lanserv/marvell-bmc/Makefile" ;;
- "sample/Makefile") CONFIG_FILES="$CONFIG_FILES sample/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
"swig/Makefile") CONFIG_FILES="$CONFIG_FILES swig/Makefile" ;;
"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" ;;
- "libedit/Makefile") CONFIG_FILES="$CONFIG_FILES libedit/Makefile" ;;
- "cmdlang/Makefile") CONFIG_FILES="$CONFIG_FILES cmdlang/Makefile" ;;
"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" ;;
@@ -16149,8 +14739,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" ;;
- "OpenIPMIcmdlang.pc") CONFIG_FILES="$CONFIG_FILES OpenIPMIcmdlang.pc" ;;
- "OpenIPMIui.pc") CONFIG_FILES="$CONFIG_FILES OpenIPMIui.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff -ru OpenIPMI-2.0.21/configure.ac OpenIPMI-2.0.21-patched/configure.ac
--- OpenIPMI-2.0.21/configure.ac 2014-01-28 20:35:02.000000000 +0100
+++ OpenIPMI-2.0.21-patched/configure.ac 2015-04-07 15:11:27.492557526 +0200
+++ OpenIPMI-2.0.21-patched/configure.ac 2015-04-08 11:17:17.041934428 +0200
@@ -52,18 +52,6 @@
SNMPLIBS="$withval"
)
......@@ -1489,6 +1530,17 @@ diff -ru OpenIPMI-2.0.21/configure.ac OpenIPMI-2.0.21-patched/configure.ac
# Check for GDBM
have_gdbm_h="no"
GDBM_LIB=
@@ -849,8 +820,8 @@
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)
@@ -861,57 +832,6 @@
*-sun-*) AC_DEFINE([_SUNOS], [], [Solaris's term.h does horrid things.]);;
esac
......@@ -1558,41 +1610,131 @@ diff -ru OpenIPMI-2.0.21/configure.ac OpenIPMI-2.0.21-patched/configure.ac
sample/Makefile
doc/Makefile
man/Makefile
@@ -930,8 +846,6 @@
swig/perl/Makefile
swig/python/Makefile
swig/python/openipmigui/Makefile
- libedit/Makefile
- cmdlang/Makefile
include/Makefile
include/OpenIPMI/Makefile
include/OpenIPMI/ipmiif.h
@@ -944,6 +858,4 @@
OpenIPMIposix.pc
OpenIPMIglib.pc
OpenIPMIglib12.pc
- OpenIPMItcl.pc
- OpenIPMIcmdlang.pc
- OpenIPMIui.pc)
+ OpenIPMItcl.pc)
diff -ru OpenIPMI-2.0.21/Makefile.am OpenIPMI-2.0.21-patched/Makefile.am
--- OpenIPMI-2.0.21/Makefile.am 2012-07-22 00:01:45.000000000 +0200
+++ OpenIPMI-2.0.21-patched/Makefile.am 2015-04-07 14:57:08.380220082 +0200
@@ -2,10 +2,10 @@
+++ OpenIPMI-2.0.21-patched/Makefile.am 2015-04-08 11:37:48.261875696 +0200
@@ -1,18 +1,18 @@
RPM = rpmbuild
RPMFLAGS = -ta
SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
- ui lanserv sample doc man $(SWIG_DIR)
+ ui sample doc man $(SWIG_DIR)
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) \
+ doc man $(SWIG_DIR)
DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+ ui sample doc man swig
+DIST_SUBDIRS = include utils lib unix glib tcl \
+ 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
@@ -34,6 +34,6 @@
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 \
+DISTCLEANFILES=OpenIPMI.spec OpenIPMI.pc OpenIPMItcl.pc \
+ OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIglib.pc \
OpenIPMIpthread.pc OpenIPMIutils.pc
diff -ru OpenIPMI-2.0.21/Makefile.in OpenIPMI-2.0.21-patched/Makefile.in
--- OpenIPMI-2.0.21/Makefile.in 2014-01-28 20:35:10.000000000 +0100
+++ OpenIPMI-2.0.21-patched/Makefile.in 2015-04-07 14:57:24.227696332 +0200
@@ -391,10 +391,10 @@
+++ OpenIPMI-2.0.21-patched/Makefile.in 2015-04-08 11:37:59.157798813 +0200
@@ -86,8 +86,8 @@
$(srcdir)/OpenIPMIutils.pc.in $(srcdir)/OpenIPMI.pc.in \
$(srcdir)/OpenIPMIpthread.pc.in $(srcdir)/OpenIPMIposix.pc.in \
$(srcdir)/OpenIPMIglib.pc.in $(srcdir)/OpenIPMIglib12.pc.in \
- $(srcdir)/OpenIPMItcl.pc.in $(srcdir)/OpenIPMIcmdlang.pc.in \
- $(srcdir)/OpenIPMIui.pc.in COPYING COPYING.LIB TODO ar-lib \
+ $(srcdir)/OpenIPMItcl.pc.in \
+ COPYING COPYING.LIB TODO ar-lib \
compile config.guess config.sub depcomp install-sh missing \
ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -103,8 +103,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 \
- OpenIPMIui.pc
+ OpenIPMIglib12.pc OpenIPMItcl.pc
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -390,24 +389,24 @@
top_srcdir = @top_srcdir@
RPM = rpmbuild
RPMFLAGS = -ta
SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
- ui lanserv sample doc man $(SWIG_DIR)
+ ui sample doc man $(SWIG_DIR)
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) \
+ doc man $(SWIG_DIR)
DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+ ui sample doc man swig
+DIST_SUBDIRS = include utils lib unix glib tcl \
+ 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 \
- OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
+DISTCLEANFILES = OpenIPMI.spec OpenIPMI.pc OpenIPMItcl.pc \
+ OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIglib.pc \
OpenIPMIpthread.pc OpenIPMIutils.pc
all: config.h
@@ -479,10 +478,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 $@
mostlyclean-libtool:
-rm -f *.lo
diff -ru OpenIPMI-2.0.21/OpenIPMI.spec OpenIPMI-2.0.21-patched/OpenIPMI.spec
--- OpenIPMI-2.0.21/OpenIPMI.spec 2014-01-28 20:35:18.000000000 +0100
+++ OpenIPMI-2.0.21-patched/OpenIPMI.spec 2015-04-07 14:58:09.886186927 +0200
+++ OpenIPMI-2.0.21-patched/OpenIPMI.spec 2015-04-08 11:18:33.332342003 +0200
@@ -64,14 +64,6 @@
%description ui
This package contains a user interface
......@@ -1607,10 +1749,40 @@ diff -ru OpenIPMI-2.0.21/OpenIPMI.spec OpenIPMI-2.0.21-patched/OpenIPMI.spec
-
###################################################
%prep
###################################################
@@ -120,7 +112,6 @@
%files
###################################################
%defattr(-,root,root)
-%{_libdir}/libOpenIPMIcmdlang.so.*
%{_libdir}/libOpenIPMIglib.so.*
# USERFIX: You might need to modify the following if glib12 is not
# handled properly by the autodetection
@@ -175,21 +166,14 @@
%files ui
###################################################
%defattr(-,root,root)
-%{_bindir}/ipmi_ui
%{_bindir}/ipmicmd
%{_bindir}/openipmicmd
-%{_bindir}/ipmish
-%{_bindir}/openipmish
%{_bindir}/solterm
%{_bindir}/rmcp_ping
-%{_libdir}/libOpenIPMIui.so.*
-%doc %{_mandir}/man1/ipmi_ui.1*
%doc %{_mandir}/man1/openipmicmd.1*
-%doc %{_mandir}/man1/openipmish.1*
%doc %{_mandir}/man1/openipmigui.1*
%doc %{_mandir}/man1/solterm.1*
%doc %{_mandir}/man1/rmcp_ping.1*
-%doc %{_mandir}/man7/ipmi_cmdlang.7*
%doc %{_mandir}/man7/openipmi_conparms.7*
###################################################
diff -ru OpenIPMI-2.0.21/OpenIPMI.spec.in OpenIPMI-2.0.21-patched/OpenIPMI.spec.in
--- OpenIPMI-2.0.21/OpenIPMI.spec.in 2012-07-22 00:01:45.000000000 +0200
+++ OpenIPMI-2.0.21-patched/OpenIPMI.spec.in 2015-04-07 14:58:29.725530925 +0200
+++ OpenIPMI-2.0.21-patched/OpenIPMI.spec.in 2015-04-08 11:18:40.004196315 +0200
@@ -64,14 +64,6 @@
%description ui
This package contains a user interface
......@@ -1626,3 +1798,33 @@ diff -ru OpenIPMI-2.0.21/OpenIPMI.spec.in OpenIPMI-2.0.21-patched/OpenIPMI.spec.
###################################################
%prep
###################################################
@@ -120,7 +112,6 @@
%files
###################################################
%defattr(-,root,root)
-%{_libdir}/libOpenIPMIcmdlang.so.*
%{_libdir}/libOpenIPMIglib.so.*
# USERFIX: You might need to modify the following if glib12 is not
# handled properly by the autodetection
@@ -175,21 +166,14 @@
%files ui
###################################################
%defattr(-,root,root)
-%{_bindir}/ipmi_ui
%{_bindir}/ipmicmd
%{_bindir}/openipmicmd
-%{_bindir}/ipmish
-%{_bindir}/openipmish
%{_bindir}/solterm
%{_bindir}/rmcp_ping
-%{_libdir}/libOpenIPMIui.so.*
-%doc %{_mandir}/man1/ipmi_ui.1*
%doc %{_mandir}/man1/openipmicmd.1*
-%doc %{_mandir}/man1/openipmish.1*
%doc %{_mandir}/man1/openipmigui.1*
%doc %{_mandir}/man1/solterm.1*
%doc %{_mandir}/man1/rmcp_ping.1*
-%doc %{_mandir}/man7/ipmi_cmdlang.7*
%doc %{_mandir}/man7/openipmi_conparms.7*
###################################################
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