Hello community, here is the log from the commit of package multipath-tools for openSUSE:Factory checked in at Tue Apr 5 18:02:08 CEST 2011.
-------- --- multipath-tools/multipath-tools.changes 2010-11-26 10:22:38.000000000 +0100 +++ multipath-tools/multipath-tools.changes 2011-04-04 18:43:23.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 4 16:40:14 UTC 2011 - [email protected] + +- fix build fail with AS_NEEDED by default + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- multipath-tools-0.4.8-asneeded.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.iEVlDS/_old 2011-04-05 18:01:39.000000000 +0200 +++ /var/tmp/diff_new_pack.iEVlDS/_new 2011-04-05 18:01:39.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package multipath-tools (Version 0.4.8) +# spec file for package multipath-tools # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,11 +27,12 @@ PreReq: %insserv_prereq %fillup_prereq coreutils grep AutoReqProv: on Version: 0.4.8 -Release: 55 +Release: 60 Summary: Tools to Manage Multipathed Devices with the device-mapper Source: multipath-tools-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: %{name}-%{version}-opensuse-11.3.diff.bz2 +Patch1: multipath-tools-0.4.8-asneeded.patch %description This package provides the tools to manage multipathed devices by @@ -73,11 +74,9 @@ %prep %setup -q -n multipath-tools-%{version} %patch0 -p1 +%patch1 %build -# This package failed when testing with -Wl,-as-needed being default. -# So we disable it here, if you want to retest, just delete this comment and the line below. -export SUSE_ASNEEDED=0 make OPTFLAGS="$RPM_OPT_FLAGS" LIB=%_lib %install ++++++ multipath-tools-0.4.8-asneeded.patch ++++++ --- 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: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
