From c547d2dc7f0b7981b3f58820a75e825d8e89c447 Mon Sep 17 00:00:00 2001 From: orbea Date: Sat, 22 May 2021 18:43:00 -0700 Subject: [PATCH 1/3] build: Remove bogus LDADD variables Signed-off-by: orbea --- Makefile.am | 1 - examples/Makefile.am | 2 +- test-tool/Makefile.am | 2 +- tests/Makefile.am | 2 +- utils/Makefile.am | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 21beffa..b7e1120 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS=$(WARN_CFLAGS) -LDADD = lib/libiscsi.la EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \ packaging/RPM/libiscsi.spec.in packaging/RPM/makerpms.sh \ diff --git a/examples/Makefile.am b/examples/Makefile.am index 036a06d..00fd8d0 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS=$(WARN_CFLAGS) -LDADD = ../lib/libiscsi.la +LIBS=../lib/libiscsi.la noinst_PROGRAMS = iscsiclient iscsi-dd diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am index 848db03..c9b954e 100644 --- a/test-tool/Makefile.am +++ b/test-tool/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS=-I. -I${srcdir}/../include \ "-D_U_=__attribute__((unused)) " \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS=$(WARN_CFLAGS) -LDADD = ../lib/libiscsipriv.la +LIBS = ../lib/libiscsipriv.la EXTRA_DIST = README diff --git a/tests/Makefile.am b/tests/Makefile.am index a43c7d0..f50dfa4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS = $(WARN_CFLAGS) -LDADD = ../lib/libiscsi.la +LIBS = ../lib/libiscsi.la noinst_PROGRAMS = prog_reconnect prog_reconnect_timeout prog_noop_reply \ prog_readwrite_iov prog_timeout prog_read_all_pdus \ diff --git a/utils/Makefile.am b/utils/Makefile.am index bde1c81..8dfaca7 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS = $(WARN_CFLAGS) -LDADD = ../lib/libiscsi.la +LIBS = ../lib/libiscsi.la bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-perf iscsi-readcapacity16 \ iscsi-swp From 9649fe1ddc41a06f13979d894eca99cd67be969f Mon Sep 17 00:00:00 2001 From: orbea Date: Sat, 22 May 2021 18:48:28 -0700 Subject: [PATCH 2/3] build: Correct usage of LIBADD and LDADD Signed-off-by: orbea --- lib/Makefile.am | 2 +- test-tool/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 4a8a916..6067e83 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -17,7 +17,7 @@ libiscsipriv_la_SOURCES += iser.c endif if HAVE_LINUX_ISER -libiscsipriv_la_LDFLAGS = -libverbs -lrdmacm -lpthread +libiscsipriv_la_LIBADD = -libverbs -lrdmacm -lpthread endif libiscsipriv_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \ diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am index c9b954e..a27daa3 100644 --- a/test-tool/Makefile.am +++ b/test-tool/Makefile.am @@ -13,7 +13,7 @@ dist_noinst_HEADERS = iscsi-support.h \ # libiscsi test tool using cunit if ISCSITEST bin_PROGRAMS = iscsi-test-cu -iscsi_test_cu_LDFLAGS = -ldl -lcunit +iscsi_test_cu_LDADD = -ldl -lcunit iscsi_test_cu_SOURCES = iscsi-test-cu.c \ iscsi-support.c \ iscsi-multipath.c \ From c437afa825e281fc892ca9f0e9b8e98bd6ce8579 Mon Sep 17 00:00:00 2001 From: orbea Date: Sat, 22 May 2021 18:55:06 -0700 Subject: [PATCH 3/3] build: Add -no-undefined where missing Signed-off-by: orbea --- examples/Makefile.am | 1 + lib/Makefile.am | 2 ++ test-tool/Makefile.am | 1 + tests/Makefile.am | 1 + utils/Makefile.am | 1 + 5 files changed, 6 insertions(+) diff --git a/examples/Makefile.am b/examples/Makefile.am index 00fd8d0..4807178 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,6 +1,7 @@ AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS=$(WARN_CFLAGS) +AM_LDFLAGS=-no-undefined LIBS=../lib/libiscsi.la noinst_PROGRAMS = iscsiclient iscsi-dd diff --git a/lib/Makefile.am b/lib/Makefile.am index 6067e83..e6f82c8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -20,6 +20,8 @@ if HAVE_LINUX_ISER libiscsipriv_la_LIBADD = -libverbs -lrdmacm -lpthread endif +libiscsipriv_la_LDFLAGS = -no-undefined + libiscsipriv_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \ "-D_U_=__attribute__((unused))" \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am index a27daa3..f40787a 100644 --- a/test-tool/Makefile.am +++ b/test-tool/Makefile.am @@ -2,6 +2,7 @@ AM_CPPFLAGS=-I. -I${srcdir}/../include \ "-D_U_=__attribute__((unused)) " \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS=$(WARN_CFLAGS) +AM_LDFLAGS=-no-undefined LIBS = ../lib/libiscsipriv.la EXTRA_DIST = README diff --git a/tests/Makefile.am b/tests/Makefile.am index f50dfa4..06bf504 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,7 @@ AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = -no-undefined LIBS = ../lib/libiscsi.la noinst_PROGRAMS = prog_reconnect prog_reconnect_timeout prog_noop_reply \ diff --git a/utils/Makefile.am b/utils/Makefile.am index 8dfaca7..7aab327 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,6 +1,7 @@ AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = -no-undefined LIBS = ../lib/libiscsi.la bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-perf iscsi-readcapacity16 \