diff options
| author | Klaus Kurzmann <mok@fluxnetz.de> | 2010-04-03 18:50:45 +0200 |
|---|---|---|
| committer | Klaus Kurzmann <mok@fluxnetz.de> | 2010-04-03 18:50:45 +0200 |
| commit | 82b51b6abd7b43ae6fa1c7d01b780d0c99d22804 (patch) | |
| tree | b1455904c992c92a18dc5f48253d0f37c4ff7590 /recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch | |
| parent | 5eef2a8892b12b3215f52065c2c177f576c41959 (diff) | |
| parent | d2bd4a770d2a5b3fd56bd3a8584935240d9012f8 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch')
| -rw-r--r-- | recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch b/recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch new file mode 100644 index 0000000000..40e6a1b16e --- /dev/null +++ b/recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch @@ -0,0 +1,81 @@ +From e03daf13a562414f07230c17998edd39564b5f1b Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Thu, 4 Mar 2010 14:16:27 +0100 +Subject: [PATCH] fix libs + +--- + progs/demos/Makefile | 2 +- + progs/glsl/Makefile | 2 +- + progs/redbook/Makefile | 2 +- + progs/samples/Makefile | 2 +- + progs/xdemos/Makefile | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/progs/demos/Makefile b/progs/demos/Makefile +index 5b1d2a0..121b862 100644 +--- a/progs/demos/Makefile ++++ b/progs/demos/Makefile +@@ -8,7 +8,7 @@ INCDIR = $(TOP)/include + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \ + $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ \ + $(APP_LIB_DEPS) + + PROGS = \ +diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile +index 3b5a595..836c4ac 100644 +--- a/progs/glsl/Makefile ++++ b/progs/glsl/Makefile +@@ -10,7 +10,7 @@ LIB_DEP = \ + $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \ + $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \ ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -lstdc++ \ + -l$(GL_LIB) $(APP_LIB_DEPS) + + # using : to avoid APP_CC pointing to CC loop +diff --git a/progs/redbook/Makefile b/progs/redbook/Makefile +index b41e488..95ed746 100644 +--- a/progs/redbook/Makefile ++++ b/progs/redbook/Makefile +@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS) + + PROGS = aaindex \ + aapoly \ +diff --git a/progs/samples/Makefile b/progs/samples/Makefile +index 64fa47a..9f72c8b 100644 +--- a/progs/samples/Makefile ++++ b/progs/samples/Makefile +@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS) + + PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ + font line logo nurb olympic overlay point prim rgbtoppm quad select \ +diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile +index f866a32..c0f4e06 100644 +--- a/progs/xdemos/Makefile ++++ b/progs/xdemos/Makefile +@@ -11,7 +11,7 @@ + # Add X11 and pthread libs to satisfy GNU gold. + APP_LIB_DEPS += -lX11 -lpthread + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) -lstdc++ $(APP_LIB_DEPS) + + PROGS = \ + corender \ +-- +1.7.0 + |