Attachment 77291 Details for Bug 62226 – Build libradeonllvm as static library

[patch] Build libradeonllvm as static library

0001-radeon-llvm-Build-libradeonllvm-as-a-static-library.patch (text/plain), 2.74 KB, created by Tom Stellard on 2013-04-01 21:13:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2013-04-01 21:13:32 UTC

Size: 2.74 KB

patch

obsolete

>From 13b40054a063ce105d5f15ae0af736f6cc921f0c Mon Sep 17 00:00:00 2001
>From: Tom Stellard <thomas.stellard@amd.com>
>Date: Mon, 1 Apr 2013 14:04:08 -0700
>Subject: [PATCH] radeon/llvm: Build libradeonllvm as a static library
>
>Building libradeonllvm as a shared object has led to a number of bugs
>and build system complications, and I don't think it's necessary for
>such a small library.
>
>This library was originally changed to a shared object to work around
>linker error in egl_static.so, but these appear to be fixed now.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=62226
>---
>
>Please test to make sure this works for your build configuration.
>
> src/gallium/drivers/r600/Makefile.am     |  2 +-
> src/gallium/drivers/radeon/Makefile.am   | 22 ++--------------------
> src/gallium/drivers/radeonsi/Makefile.am |  2 +-
> 3 files changed, 4 insertions(+), 22 deletions(-)
>
>diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
>index a067f2c..874cf8a 100644
>--- a/src/gallium/drivers/r600/Makefile.am
>+++ b/src/gallium/drivers/r600/Makefile.am
>@@ -18,7 +18,7 @@ if R600_NEED_RADEON_GALLIUM
> libr600_la_SOURCES += \
> 	$(LLVM_C_SOURCES)
> 
>-libr600_la_LIBADD = ../radeon/libllvmradeon@VERSION@.la
>+libr600_la_LIBADD = ../radeon/libllvmradeon.la
> 
> AM_CFLAGS += \
> 	$(LLVM_CFLAGS) \
>diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
>index 140f6c6..c1ffb4a 100644
>--- a/src/gallium/drivers/radeon/Makefile.am
>+++ b/src/gallium/drivers/radeon/Makefile.am
>@@ -1,20 +1,7 @@
> include Makefile.sources
> include $(top_srcdir)/src/gallium/Automake.inc
> 
>-LIBGALLIUM_LIBS=
>-
>-if HAVE_GALLIUM_R600
>-if HAVE_GALLIUM_RADEONSI
>-lib_LTLIBRARIES = libllvmradeon@VERSION@.la
>-libllvmradeon@VERSION@_la_LDFLAGS = -Wl, -shared -avoid-version \
>-	$(LLVM_LDFLAGS)
>-LIBGALLIUM_LIBS += $(top_builddir)/src/gallium/auxiliary/libgallium.la
>-else
>-noinst_LTLIBRARIES = libllvmradeon@VERSION@.la
>-endif
>-else
>-noinst_LTLIBRARIES = libllvmradeon@VERSION@.la
>-endif
>+noinst_LTLIBRARIES = libllvmradeon.la
> 
> AM_CXXFLAGS = \
> 	$(GALLIUM_CFLAGS) \
>@@ -25,11 +12,6 @@ AM_CFLAGS = \
> 	$(GALLIUM_CFLAGS) \
> 	$(LLVM_CFLAGS)
> 
>-libllvmradeon@VERSION@_la_SOURCES = \
>+libllvmradeon_la_SOURCES = \
> 	$(CPP_FILES) \
> 	$(C_FILES)
>-
>-libllvmradeon@VERSION@_la_LIBADD = \
>-	$(LIBGALLIUM_LIBS) \
>-	$(CLOCK_LIB) \
>-	$(LLVM_LIBS)
>diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
>index e771d31..8c03b9f 100644
>--- a/src/gallium/drivers/radeonsi/Makefile.am
>+++ b/src/gallium/drivers/radeonsi/Makefile.am
>@@ -33,4 +33,4 @@ AM_CPPFLAGS = \
> AM_CFLAGS = $(LLVM_CFLAGS)
> 
> libradeonsi_la_SOURCES = $(C_SOURCES)
>-libradeonsi_la_LIBADD = ../radeon/libllvmradeon@VERSION@.la
>+libradeonsi_la_LIBADD = ../radeon/libllvmradeon.la
>-- 
>1.7.11.4
>

Actions: View | Splinter Review

Attachments on bug 62226: 76398 | 77291

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.