altcloud/fence-virt
3
0
Fork 1
Code Issues Pull Requests Releases Activity

fix build with PIC and PIE

Browse Source
This commit is contained in:
Andrew A. Vasilyev 2019-05-07 15:46:33 +03:00
parent 1d42a96e60
commit 12d8c04efa
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.top.in
View File

@ -4,7 +4,7 @@ CXX=@CXX@
CFLAGS=@CFLAGS@
CFLAGS+=-Wall -Wformat=2 -Wstrict-prototypes -Wshadow -D_GNU_SOURCE
CXXFLAGS=@CXXFLAGS@
CXXFLAGS+=-Wall -Wformat=2 -Wstrict-prototypes -Wshadow -D_GNU_SOURCE
CXXFLAGS+=-Wall -fPIC -Wformat=2 -Wstrict-prototypes -Wshadow -D_GNU_SOURCE
LEX=@LEX@
YACC=@YACC@

4
client/Makefile.in
View File

@ -40,10 +40,10 @@ fence_xvm: ${TARGET}
ln -snf $^ $@
fence_virt: ${fence_virt_SOURCES:.c=.o}
$(CC) $(CFLAGS) -pie -o $@ $^ $(LIBS) -L../common -lfence_virt
$(CC) $(CFLAGS) $(LDFLAGS) -pie -o $@ $^ $(LIBS) -L../common -lfence_virt
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $^ $(INCLUDES)
$(CC) $(CFLAGS) -fPIC -c -o $@ $^ $(INCLUDES)
install: all
if [ ! -d ${DESTDIR}/${sbindir} ]; then \

2
common/Makefile.in
View File

@ -37,7 +37,7 @@ tcp.o: tcp.c
$(CC) $(CFLAGS) -fPIC -c -o $@ $^ $(INCLUDES)
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $^ $(INCLUDES)
$(CC) $(CFLAGS) -fPIC -c -o $@ $^ $(INCLUDES)
clean:
rm -f ${TARGETS} *~ *.o testprog

28
server/Makefile.in
View File

@ -159,46 +159,46 @@ endif
all: ${TARGETS} ${MODULES}
fence_virtd: ${fence_virtd_SOURCES:.c=.o} ${fence_virtd_cxx_SOURCES:.cpp=.opp}
$(CXX) $(CXXFLAGS) -o $@ $^ $(MAIN_LIBS) $(LIBS)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(MAIN_LIBS) $(LIBS)
multicast.so: ${multicast_so_SOURCES:.c=.o}
$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
libvirt.so: ${libvirt_so_SOURCES:.c=.o}
$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS)
libvirt-qmf.so: ${libvirt_qmf_so_SOURCES:.c=.o} ${libvirt_qmf_cxx_so_SOURCES:.cpp=.opp}
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) -shared $(VIRT_QPID)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(VIRT_QPID)
pm-fence.so: ${pm_fence_so_SOURCES:.c=.o}
$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -shared $(PACEMAKER_LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(PACEMAKER_LIBS)
cpg.so: ${cpg_so_SOURCES:.c=.o}
$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS) $(XML_LIBS) $(COROSYNC_LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS) $(XML_LIBS) $(COROSYNC_LIBS)
null.so: ${null_so_SOURCES:.c=.o}
$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -shared
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared
serial.so: ${serial_so_SOURCES:.c=.o}
$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS) $(XML_LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS) $(XML_LIBS)
tcp.so: ${tcp_so_SOURCES:.c=.o}
$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
vsock.so: ${vsock_so_SOURCES:.c=.o}
$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
cpg-virt.o: cpg-virt.c
$(CC) $(CFLAGS) -fPIC -c -o $@ $^ $(INCLUDES)
$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -c -o $@ $^ $(INCLUDES)
virt.o: virt.c
$(CC) $(CFLAGS) -fPIC -c -o $@ $^ $(INCLUDES)
$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -c -o $@ $^ $(INCLUDES)
virt-serial.o: virt-serial.c
$(CC) $(CFLAGS) -fPIC -c -o $@ $^ $(INCLUDES)
$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -c -o $@ $^ $(INCLUDES)
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $^ $(INCLUDES)
$(CC) $(CFLAGS) -fPIC -c -o $@ $^ $(INCLUDES)
%.opp: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $^ $(INCLUDES)