[Mesa-dev] [PATCH V2 06/11] loader: Use drirc device_id parameter in complement to DRI_PRIME

[Michel Dänzer]

On 29.05.2014 12:22, Axel Davy wrote:
> DRI_PRIME is not very handy, because you have to launch the executable
> with it set, which is not always easy to do.
> By using drirc, the user specifies the target executable
> and the device to use. After that the program will be launched everytime
> on the target device.
> 
> v2: fix compilation issue

Still doesn't build here (on top of
http://lists.freedesktop.org/archives/mesa-dev/2014-May/060312.html
to fix today's build failure), see below. This fixes it, but I'm not
sure it's the proper fix:

diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index 38758a0..12dc42f 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -110,7 +110,7 @@ if HAVE_EGL_DRIVER_DRI2
 AM_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
 AM_CFLAGS += -DHAVE_XCB_DRI2
 libEGL_la_LIBADD += ../drivers/dri2/libegl_dri2.la
-libEGL_la_LIBADD += $(DLOPEN_LIBS) $(LIBDRM_LIBS)
+libEGL_la_LIBADD += $(DLOPEN_LIBS) $(LIBDRM_LIBS) $(DRI_LIB_DEPS)
 endif

 include $(top_srcdir)/install-lib-links.mk
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 08369f2..3bd4c14 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -32,6 +32,7 @@ libgbm_la_LDFLAGS = \

 libgbm_la_LIBADD = \
        $(top_builddir)/src/loader/libloader.la \
+       $(DRI_LIB_DEPS)
        $(DLOPEN_LIBS)

 if HAVE_EGL_PLATFORM_WAYLAND



make[2]: Entering directory '/home/daenzer/src/mesa-git/mesa/build-amd64/src/gbm'
  CCLD     libgbm.la
../../src/loader/.libs/libloader.a(libloader_la-xmlconfig.o): In function `strToF':
/home/daenzer/src/mesa-git/mesa/build-amd64/src/loader/../../../src/mesa/drivers/dri/common/xmlconfig.c:273: undefined reference to `pow'
collect2: error: ld returned 1 exit status
Makefile:797: recipe for target 'libgbm.la' failed
make[2]: *** [libgbm.la] Error 1
make[2]: Leaving directory '/home/daenzer/src/mesa-git/mesa/build-amd64/src/gbm'

make[2]: Entering directory '/home/daenzer/src/mesa-git/mesa/build-amd64/src/egl/main'
  CCLD     libEGL.la
../drivers/dri2/.libs/libegl_dri2.a(libloader_la-xmlconfig.o): In function `strToF':
/home/daenzer/src/mesa-git/mesa/build-amd64/src/loader/../../../src/mesa/drivers/dri/common/xmlconfig.c:273: undefined reference to `pow'
collect2: error: ld returned 1 exit status
Makefile:664: recipe for target 'libEGL.la' failed
make[2]: *** [libEGL.la] Error 1
make[2]: Leaving directory '/home/daenzer/src/mesa-git/mesa/build-amd64/src/egl/main'


-- 
Earthling Michel Dänzer            |                  http://www.amd.com
Libre software enthusiast          |                Mesa and X developer