Hi, aparently quite few parts of gallium does not bother with respecting user set LDFLAGS which is kinda bad.
So i fixed all visible occurances for my radeon build, but i can't test it for everything (maybe if some gentoo user running different configuration is willing to post the QA warning it prints out [we have quite advandced test hooks that print out various issues like that]...) Without much more ado plz see (and hopefully apply) the attachments. Cheers -------- Tomáš Chvátal Gentoo Linux Developer [Council/KDE/Overlays/QA/X11] E-Mail : scarab...@gentoo.org GnuPG FP : 94A4 5CCD 85D3 DE24 FE99 F924 1C1E 9CDE 0341 4587 GnuPG ID : 03414587
From 0f1167717559d0cf4c276ba3f1c5045232cc26c5 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarab...@gentoo.org>
Date: Wed, 20 Jan 2010 21:41:05 +0100
Subject: [PATCH 1/3] [r300g] Egl: behave nice with LDFLAGS.
---
src/gallium/winsys/drm/radeon/egl/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/gallium/winsys/drm/radeon/egl/Makefile
b/src/gallium/winsys/drm/radeon/egl/Makefile
index fcbfd09..f44c62d 100644
--- a/src/gallium/winsys/drm/radeon/egl/Makefile
+++ b/src/gallium/winsys/drm/radeon/egl/Makefile
@@ -25,7 +25,7 @@ $(LIBNAME): $(OBJECTS) $(GALLIUM_AUXILIARIES) $(PIPE_DRIVERS)
Makefile
$(MKLIB) -noprefix -o $@ $(OBJECTS) \
-Wl,--whole-archive $(PIPE_DRIVERS) -Wl,--no-whole-archive \
-Wl,--start-group $(GALLIUM_AUXILIARIES) -Wl,--end-group \
- $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
+ $(LDFLAGS) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
clean:
-rm -f *.o *.so *~
--
1.6.6
From 233baa48cac87167b5c3452c6edec12297b765f6 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarab...@gentoo.org>
Date: Wed, 20 Jan 2010 21:44:52 +0100
Subject: [PATCH 2/3] [egl] Behave nice with LDFLAGS.
---
src/egl/drivers/glx/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/egl/drivers/glx/Makefile b/src/egl/drivers/glx/Makefile
index 20ef035..52e45ae 100644
--- a/src/egl/drivers/glx/Makefile
+++ b/src/egl/drivers/glx/Makefile
@@ -54,7 +54,7 @@ $(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(OBJECTS)
-major 1 -minor 0 \
-L$(TOP)/$(LIB_DIR) \
-install $(TOP)/$(LIB_DIR) \
- $(OBJECTS) $(DRM_LIB) $(MISC_LIBS)
+ ${LDFLAGS} $(OBJECTS) $(DRM_LIB) $(MISC_LIBS)
install:
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
--
1.6.6
From aa4bc661b88cf2994603799ed37ae49cccb13a77 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarab...@gentoo.org>
Date: Wed, 20 Jan 2010 21:50:09 +0100
Subject: [PATCH 3/3] [gallium] Respect LDFLAGS in teplate Makefile.
---
src/gallium/winsys/drm/Makefile.template | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/winsys/drm/Makefile.template
b/src/gallium/winsys/drm/Makefile.template
index 9635c3c..b3f204d 100644
--- a/src/gallium/winsys/drm/Makefile.template
+++ b/src/gallium/winsys/drm/Makefile.template
@@ -85,13 +85,13 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS)
$(WINOBJ) Makefile $(TOP)
$(MKLIB) -noprefix -o $@ \
$(OBJECTS) $(PIPE_DRIVERS) \
-Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
- $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
+ $(LDFLAGS) $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
$(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
$(MKLIB) -o $(LIBNAME_EGL) \
-linker "$(CC)" \
-noprefix \
- $(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) $(PIPE_DRIVERS)
$(WINOBJ) $(DRI_LIB_DEPS) \
+ $(LDFLAGS) $(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS)
$(PIPE_DRIVERS) $(WINOBJ) $(DRI_LIB_DEPS) \
--whole-archive $(LIBS) $(GALLIUM_AUXILIARIES)
--no-whole-archive $(DRIVER_EXTRAS)
$(TOP)/$(LIB_DIR)/gallium:
--
1.6.6
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Throughout its 18-year history, RSA Conference consistently attracts the world's best and brightest in the field, creating opportunities for Conference attendees to learn about information security's most important issues through interactions with peers, luminaries and emerging and established companies. http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
