recipes/mesa/mesa-xlib-7.8/fix-progs-makefile.patch

   1 From e03daf13a562414f07230c17998edd39564b5f1b Mon Sep 17 00:00:00 2001
   2 From: Martin Jansa <Martin.Jansa@gmail.com>
   3 Date: Thu, 4 Mar 2010 14:16:27 +0100
   4 Subject: [PATCH] fix libs
   5
   6 ---
   7  progs/demos/Makefile   |    2 +-
   8  progs/glsl/Makefile    |    2 +-
   9  progs/redbook/Makefile |    2 +-
  10  progs/samples/Makefile |    2 +-
  11  progs/xdemos/Makefile  |    2 +-
  12  5 files changed, 5 insertions(+), 5 deletions(-)
  13
  14 diff --git a/progs/demos/Makefile b/progs/demos/Makefile
  15 index 5b1d2a0..121b862 100644
  16 --- a/progs/demos/Makefile
  17 +++ b/progs/demos/Makefile
  18 @@ -8,7 +8,7 @@ INCDIR = $(TOP)/include
  19  LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
  20         $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
  21
  22 -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
  23 +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ \
  24         $(APP_LIB_DEPS)
  25
  26  PROGS = \
  27 diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
  28 index 3b5a595..836c4ac 100644
  29 --- a/progs/glsl/Makefile
  30 +++ b/progs/glsl/Makefile
  31 @@ -10,7 +10,7 @@ LIB_DEP = \
  32         $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
  33         $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
  34
  35 -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \
  36 +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -lstdc++ \
  37         -l$(GL_LIB) $(APP_LIB_DEPS)
  38
  39  # using : to avoid APP_CC pointing to CC loop
  40 diff --git a/progs/redbook/Makefile b/progs/redbook/Makefile
  41 index b41e488..95ed746 100644
  42 --- a/progs/redbook/Makefile
  43 +++ b/progs/redbook/Makefile
  44 @@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
  45
  46  LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
  47
  48 -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
  49 +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
  50
  51  PROGS = aaindex \
  52         aapoly \
  53 diff --git a/progs/samples/Makefile b/progs/samples/Makefile
  54 index 64fa47a..9f72c8b 100644
  55 --- a/progs/samples/Makefile
  56 +++ b/progs/samples/Makefile
  57 @@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
  58
  59  LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
  60
  61 -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
  62 +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
  63
  64  PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
  65         font line logo nurb olympic overlay point prim rgbtoppm quad select \
  66 diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
  67 index f866a32..c0f4e06 100644
  68 --- a/progs/xdemos/Makefile
  69 +++ b/progs/xdemos/Makefile
  70 @@ -11,7 +11,7 @@
  71  # Add X11 and pthread libs to satisfy GNU gold.
  72  APP_LIB_DEPS += -lX11 -lpthread
  73
  74 -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS)
  75 +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) -lstdc++ $(APP_LIB_DEPS)
  76
  77  PROGS = \
  78         corender \
  79 --
  80 1.7.0
  81