Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (870af82d51a6e4cf3e0c482955d9601b7bbd2c91)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (870af82d51a6e4cf3e0c482955d9601b7bbd2c91)
  • Date: Thu, 14 Oct 2010 17:48:50 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

graphics-libs/mesalib/BUILD | 3 ++-
graphics-libs/mesalib/HISTORY | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 870af82d51a6e4cf3e0c482955d9601b7bbd2c91
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mesalib: Radeon's mklib does not properly pass '-s' to LDFLAGS (bad fix)

mklib: Making Linux shared library: r300_dri.so.tmp
g++ -march=native -mtune=native -m32 -pipe -DPIC -fPIC -O2 -Wall
-Wmissing-prototypes -std=c99 -ffast-math -fvisibility=hidden
-fno-strict-aliasing -fPIC -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM
-DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS -DHAVE_POSIX_MEMALIGN -DUSE_XCB
-DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS
-DHAVE_XCB_DRI2 -DHAVE_LIBUDEV -DHAVE_XEXTPROTO_71 -o r300_dri.so.test
../../../../src/mesa/drivers/dri/common/dri_test.o r300_dri.so.tmp
-ldrm -lexpat -lm -lpthread -ldl -ltalloc -ldrm_radeon;
mv -f r300_dri.so.tmp r300_dri.so
/bin/install -c r300_dri.so ../../../../lib/gallium
make[3]: Leaving directory
`/usr/src/Mesa-7.9/src/gallium/targets/dri-r300'
make[3]: Entering directory
`/usr/src/Mesa-7.9/src/gallium/targets/xorg-radeon'
/bin/sh ../../../../bin/mklib -noprefix -o radeon_drv.so -s -Wl,-O1
-Wl,--as-needed -Wl,--hash-style=gnu radeon_target.o radeon_xorg.o
../../../../src/gallium/state_trackers/xorg/libxorgtracker.a
../../../../src/gallium/winsys/radeon/drm/libradeonwinsys.a
../../../../src/gallium/drivers/r300/libr300.a
../../../../src/gallium/drivers/galahad/libgalahad.a
../../../../src/gallium/drivers/trace/libtrace.a
../../../../src/gallium/drivers/rbug/librbug.a
../../../../src/gallium/auxiliary/libgallium.a -ldrm -ldrm_radeon
mklib: Unknown option: -s
make[3]: *** [radeon_drv.so] Error 1
make[3]: Leaving directory
`/usr/src/Mesa-7.9/src/gallium/targets/xorg-radeon'

diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index c56a12e..397e436 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -6,7 +6,8 @@ case $MESALIB_GALLIUM in
intel) OPTS="${OPTS} --enable-gallium-intel" ;;
i915) OPTS="${OPTS} --enable-gallium-i915" ;;
i965) OPTS="${OPTS} --enable-gallium-i965" ;;
- radeon) OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel" ;;
+ radeon) OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel"
+ LDFLAGS="${LDFLAGS/-s/}" ;;
r600) OPTS="${OPTS} --enable-gallium-r600" ;;
nouveau) OPTS="${OPTS} --enable-gallium-nouveau --disable-gallium-intel" ;;
swrast) OPTS="${OPTS} --enable-gallium-swrast" ;;
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index ce5a424..07c8b32 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2010-10-14 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Radeon's mklib does not properly pass '-s' to LDFLAGS (bad
fix)
+
2010-10-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: feature => 7.6.2, developement => 7.9;
updated MESALIB_VER=developement to 7.9



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (870af82d51a6e4cf3e0c482955d9601b7bbd2c91), Eric Sandall, 10/14/2010

Archive powered by MHonArc 2.6.24.

Top of Page