/[packages]/cauldron/mesa/current/SOURCES/0901-gallium-only-link-static-archives-between-ld-start-e.patch
ViewVC logotype

Contents of /cauldron/mesa/current/SOURCES/0901-gallium-only-link-static-archives-between-ld-start-e.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 336175 - (show annotations) (download)
Sat Dec 29 18:58:23 2012 UTC (11 years, 9 months ago) by cjw
File size: 1674 byte(s) 
- 9.1 snapsnot from 20121228
- disable separate osmesa build since it fails to build, let's hope it is not needed anymore
- move autoreconf to build section where it belongs
- drop unrecognized configure options --enable-shared-dricore and --disable-va
1 From 62fd60132ce4162b66ec4f4ae10aaa357160e654 Mon Sep 17 00:00:00 2001
2 From: Olivier Blin <dev@blino.org>
3 Date: Sat, 4 Aug 2012 00:29:45 +0200
4 Subject: [PATCH] gallium: only link static archives between ld start/end
5 group options
6
7 llvmpipe test programs failed to link with --as-needed ld option
8
9 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=52167
10 ---
11 src/gallium/Makefile.template | 2 +-
12 src/gallium/drivers/llvmpipe/Makefile | 3 ++-
13 2 files changed, 3 insertions(+), 2 deletions(-)
14
15 diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
16 index 036c119..c30477a 100644
17 --- a/src/gallium/Makefile.template
18 +++ b/src/gallium/Makefile.template
19 @@ -41,7 +41,7 @@ depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(SYMLINKS) $(GENERATED_SOURC
20 $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(GENERATED_SOURCES) 2> /dev/null
21
22 $(PROGS): % : %.o $(PROGS_DEPS)
23 - $(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group $(LIBS) -Wl,--end-group
24 + $(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group $(LIBS) -Wl,--end-group $(LDADD)
25
26 # Emacs tags
27 tags:
28 diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
29 index ef16fc7..35f8fe8 100644
30 --- a/src/gallium/drivers/llvmpipe/Makefile
31 +++ b/src/gallium/drivers/llvmpipe/Makefile
32 @@ -63,7 +63,8 @@
33 PROGS_DEPS := ../../auxiliary/libgallium.a
34
35 LDFLAGS += $(LLVM_LDFLAGS)
36 -LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
37 +LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a
38 +LDADD += $(LLVM_LIBS) $(GL_LIB_DEPS)
39 LD=$(CXX)
40
41 $(PROGS): lp_test_main.o libllvmpipe.a
42 --
43 1.7.11.4
  ViewVC Help
Powered by ViewVC 1.1.30