- use -fPIC to build liblustre to stop the .os from containing relocations

  that x86_64 can't put in .sos
- don't include ldlm *and* ptlrpc libs in liblustre.{a,so}

diff --git a/lnet/lnet/Makefile.am b/lnet/lnet/Makefile.am
index 8c03749..d1b00e3 100644 (file)
--- a/lnet/lnet/Makefile.am
+++ b/lnet/lnet/Makefile.am
@@ -8,3 +8,4 @@ CPPFLAGS=
 INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include
 lib_LIBRARIES= libportals.a
 libportals_a_SOURCES= api-eq.c api-init.c api-me.c api-errno.c api-ni.c api-wrap.c lib-dispatch.c lib-init.c lib-me.c lib-msg.c lib-eq.c lib-md.c lib-move.c lib-ni.c lib-pid.c
+libportals_a_CFLAGS= -fPIC

diff --git a/lnet/ulnds/Makefile.am b/lnet/ulnds/Makefile.am
index dc427b0..3cce5ee 100644 (file)
--- a/lnet/ulnds/Makefile.am
+++ b/lnet/ulnds/Makefile.am
@@ -3,3 +3,4 @@ INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include -I$(srcdir)
 lib_LIBRARIES = libtcpnal.a
 pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
+libtcpnal_a_CFLAGS = -fPIC

diff --git a/lnet/ulnds/socklnd/Makefile.am b/lnet/ulnds/socklnd/Makefile.am
index dc427b0..3cce5ee 100644 (file)
--- a/lnet/ulnds/socklnd/Makefile.am
+++ b/lnet/ulnds/socklnd/Makefile.am
@@ -3,3 +3,4 @@ INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include -I$(srcdir)
 lib_LIBRARIES = libtcpnal.a
 pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
+libtcpnal_a_CFLAGS = -fPIC

diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index f1878df..80eae3e 100644 (file)
--- a/lnet/utils/Makefile.am
+++ b/lnet/utils/Makefile.am
@@ -21,6 +21,7 @@ acceptor_SOURCES = acceptor.c # -lefence
 wirecheck_SOURCES = wirecheck.c
 
 libptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
+libptlctl_a_CFLAGS = -fPIC
 
 gmnalnid_SOURCES = gmnalnid.c
 

diff --git a/lustre/portals/portals/Makefile.am b/lustre/portals/portals/Makefile.am
index 8c03749..d1b00e3 100644 (file)
--- a/lustre/portals/portals/Makefile.am
+++ b/lustre/portals/portals/Makefile.am
@@ -8,3 +8,4 @@ CPPFLAGS=
 INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include
 lib_LIBRARIES= libportals.a
 libportals_a_SOURCES= api-eq.c api-init.c api-me.c api-errno.c api-ni.c api-wrap.c lib-dispatch.c lib-init.c lib-me.c lib-msg.c lib-eq.c lib-md.c lib-move.c lib-ni.c lib-pid.c
+libportals_a_CFLAGS= -fPIC

diff --git a/lustre/portals/unals/Makefile.am b/lustre/portals/unals/Makefile.am
index dc427b0..3cce5ee 100644 (file)
--- a/lustre/portals/unals/Makefile.am
+++ b/lustre/portals/unals/Makefile.am
@@ -3,3 +3,4 @@ INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include -I$(srcdir)
 lib_LIBRARIES = libtcpnal.a
 pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
+libtcpnal_a_CFLAGS = -fPIC

diff --git a/lustre/portals/utils/Makefile.am b/lustre/portals/utils/Makefile.am
index f1878df..80eae3e 100644 (file)
--- a/lustre/portals/utils/Makefile.am
+++ b/lustre/portals/utils/Makefile.am
@@ -21,6 +21,7 @@ acceptor_SOURCES = acceptor.c # -lefence
 wirecheck_SOURCES = wirecheck.c
 
 libptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
+libptlctl_a_CFLAGS = -fPIC
 
 gmnalnid_SOURCES = gmnalnid.c