8c75d20a48
OBS-URL: https://build.opensuse.org/request/show/65973 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=21
65 lines
1.8 KiB
Diff
65 lines
1.8 KiB
Diff
--- multipathd/Makefile.orig
|
|
+++ multipathd/Makefile
|
|
@@ -5,8 +5,8 @@ include ../Makefile.inc
|
|
#
|
|
# basic flags setting
|
|
#
|
|
-CFLAGS += -I$(multipathdir)
|
|
-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
|
|
+CFLAGS += -pthread -I$(multipathdir)
|
|
+LDFLAGS += -ldevmapper -lreadline -lncurses -ldl \
|
|
-lmultipath -L$(multipathdir)
|
|
|
|
#
|
|
@@ -28,7 +28,7 @@ OBJS = main.o pidfile.o uxlsnr.o uxclnt.
|
|
all : $(EXEC)
|
|
|
|
$(EXEC): $(OBJS)
|
|
- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS)
|
|
+ $(CC) $(CFLAGS) -o $(EXEC) $(OBJS) $(LDFLAGS)
|
|
|
|
install:
|
|
$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
|
|
--- multipath/Makefile.orig
|
|
+++ multipath/Makefile
|
|
@@ -6,8 +6,8 @@ include ../Makefile.inc
|
|
|
|
OBJS = main.o
|
|
|
|
-CFLAGS += -I$(multipathdir)
|
|
-LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
|
|
+CFLAGS += -pthread -I$(multipathdir)
|
|
+LDFLAGS += -ldevmapper -ldl -lmultipath -L$(multipathdir)
|
|
|
|
EXEC = multipath
|
|
|
|
--- libmultipath/Makefile.orig
|
|
+++ libmultipath/Makefile
|
|
@@ -7,7 +7,7 @@ include ../Makefile.inc
|
|
SONAME=0
|
|
DEVLIB = libmultipath.so
|
|
LIBS = $(DEVLIB).$(SONAME)
|
|
-LIBDEPS = -lpthread -ldl -ldevmapper
|
|
+LIBDEPS = -ldl -ldevmapper
|
|
|
|
OBJS = memory.o parser.o vector.o devmapper.o callout.o \
|
|
hwtable.o blacklist.o util.o dmparser.o config.o \
|
|
@@ -19,7 +19,7 @@ OBJS = memory.o parser.o vector.o devmap
|
|
|
|
LIBDM_API_FLUSH = $(shell objdump -T ${LIB}/libdevmapper.so.* ; fi | grep -c dm_task_no_flush)
|
|
|
|
-CFLAGS += -D_GNU_SOURCE
|
|
+CFLAGS += -pthread -D_GNU_SOURCE
|
|
ifneq ($(strip $(LIBDM_API_FLUSH)),0)
|
|
CFLAGS += -DLIBDM_API_FLUSH
|
|
endif
|
|
@@ -27,7 +27,7 @@ endif
|
|
all: $(LIBS)
|
|
|
|
$(LIBS): $(OBJS)
|
|
- $(CC) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
|
|
+ $(CC) $(SHARED_FLAGS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS) $(LIBDEPS)
|
|
ln -sf $@ $(DEVLIB)
|
|
|
|
install:
|