Control: tags -1 patch
On Fri, Aug 17, 2018 at 07:21:19PM +0000, Santiago Vila wrote:
>...
> /bin/bash ../libtool --tag=CXX --mode=link g++ -I/usr/include/tcl8.6
> -I/usr/include/infiniband -I/usr/include -DOSM_VENDOR_INTF_OPENIB
> -DOSM_BUILD_OPENIB -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -O2 -Wall
> -fno-strict-aliasing -fPIC -DIBIS_VERSION=\"1.5.7\" -g -O2
> -fdebug-prefix-map=/<<BUILDDIR>>/ibutils-1.5.7+0.2.gbd7e502=.
> -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -o
> ibis ibissh_wrap.o -L. -libiscom -L/usr/lib/x86_64-linux-gnu -lopensm
> -losmvendor -losmcomp -libumad -L/usr/lib/x86_64-linux-gnu -ltcl8.6 -ldl -lz
> -lpthread -lm
> libtool: link: g++ -I/usr/include/tcl8.6 -I/usr/include/infiniband
> -I/usr/include -DOSM_VENDOR_INTF_OPENIB -DOSM_BUILD_OPENIB
> -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -O2 -Wall -fno-strict-aliasing -fPIC
> -DIBIS_VERSION=\"1.5.7\" -g -O2
> -fdebug-prefix-map=/<<BUILDDIR>>/ibutils-1.5.7+0.2.gbd7e502=.
> -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -o
> ibis ibissh_wrap.o -L. -libiscom -L/usr/lib/x86_64-linux-gnu -lopensm
> -losmvendor -losmcomp -libumad -ltcl8.6 -ldl -lz -lpthread -lm
> /usr/bin/ld: cannot find -libiscom
> collect2: error: ld returned 1 exit status
> make[4]: *** [Makefile:616: ibis] Error 1
>...
Fix is attached.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
Description: Fix the Makefile dependencies
Author: Adrian Bunk <b...@debian.org>
Bug-Debian: https://bugs.debian.org/906553
--- ibutils-1.5.7+0.2.gbd7e502.orig/ibis/src/Makefile.am
+++ ibutils-1.5.7+0.2.gbd7e502/ibis/src/Makefile.am
@@ -53,12 +53,10 @@ LIB_VER_TRIPLET="1:0:0"
LIB_FILE_TRIPLET=1.0.0
lib_LTLIBRARIES = libibis.la
-noinst_LIBRARIES = libibiscom.a
+noinst_LTLIBRARIES = libibiscom.la
-libibiscom_a_SOURCES = ibbbm.c ibcr.c ibis.c ibis_gsi_mad_ctrl.c \
+libibiscom_la_SOURCES = ibbbm.c ibcr.c ibis.c ibis_gsi_mad_ctrl.c \
ibpm.c ibsac.c ibsm.c ibvs.c ibcc.c
-# Below op causes renaming of the obj files - used when same source creates 2 targets (TODO: is this duplication needed ?)
-libibiscom_a_CFLAGS = $(AM_CFLAGS)
# client library to be used by IBIS TCL package:
libibis_la_SOURCES = ibis_wrap.c ibbbm.c ibcr.c ibis.c ibis_gsi_mad_ctrl.c \
@@ -75,7 +73,7 @@ LDADD = $(OSM_LDFLAGS)
ibis_SOURCES = ibissh_wrap.cpp
# note the order of the libraries does matter as we static link
-ibis_LDADD = -L. -libiscom $(OSM_LDFLAGS) $(TCL_LIBS)
+ibis_LDADD = -L. libibiscom.la $(OSM_LDFLAGS) $(TCL_LIBS)
# SWIG FILES:
