Gentoo Archives: gentoo-commits

From: "Kacper Kowalik (xarthisius)" <xarthisius@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/xen-tools/files: xen-tools-4.0.0-asneeded.patch xen-tools-4.0.0-as-needed.patch
Date: Fri, 25 Jun 2010 16:44:03
Message-Id: 20100625164356.79DAE2CF65@corvid.gentoo.org
1 xarthisius 10/06/25 16:43:56
2
3 Added: xen-tools-4.0.0-asneeded.patch
4 Removed: xen-tools-4.0.0-as-needed.patch
5 Log:
6 Fixing build with --as-neeed wrt bug 320339. Thanks to Diego for reporting.
7 (Portage version: 2.1.8.3/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 app-emulation/xen-tools/files/xen-tools-4.0.0-asneeded.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/files/xen-tools-4.0.0-asneeded.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/files/xen-tools-4.0.0-asneeded.patch?rev=1.1&content-type=text/plain
14
15 Index: xen-tools-4.0.0-asneeded.patch
16 ===================================================================
17 --- tools/xenpaging/Makefile
18 +++ tools/xenpaging/Makefile
19 @@ -4,7 +4,7 @@
20 CFLAGS += -I $(XEN_XC)
21 CFLAGS += -I ./
22 CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore)
23 -LDFLAGS += $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore)
24 +xenpaging_LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore)
25
26 POLICY = default
27
28 @@ -27,7 +27,7 @@
29 all: $(IBINS)
30
31 xenpaging: $(OBJS)
32 - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
33 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(xenpaging_LIBS)
34
35 install: all
36 $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
37 --- tools/libxc/Makefile
38 +++ tools/libxc/Makefile
39 @@ -167,9 +167,8 @@
40 xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
41 xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
42
43 -libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
44 libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
45 - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
46 + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) $(call zlib-options,l)
47
48 -include $(DEPS)