diff options
Diffstat (limited to 'recipes/mesa/files')
| -rw-r--r-- | recipes/mesa/files/mklib-cross.patch | 14 | ||||
| -rw-r--r-- | recipes/mesa/files/mklib-rpath-link.patch | 20 |
2 files changed, 34 insertions, 0 deletions
diff --git a/recipes/mesa/files/mklib-cross.patch b/recipes/mesa/files/mklib-cross.patch new file mode 100644 index 0000000000..fbe86e3c4d --- /dev/null +++ b/recipes/mesa/files/mklib-cross.patch @@ -0,0 +1,14 @@ +--- s/bin/mklib~ 2008-02-19 15:30:18.000000000 +0000 ++++ s/bin/mklib 2008-07-27 11:15:25.000000000 +0100 +@@ -204,9 +204,9 @@ + if [ "x$LINK" = "x" ] ; then + # -linker was not specified so set default link command now + if [ $CPLUSPLUS = 1 ] ; then +- LINK=g++ ++ LINK=$CXX + else +- LINK=gcc ++ LINK=$CC + fi + fi + diff --git a/recipes/mesa/files/mklib-rpath-link.patch b/recipes/mesa/files/mklib-rpath-link.patch new file mode 100644 index 0000000000..07361f531a --- /dev/null +++ b/recipes/mesa/files/mklib-rpath-link.patch @@ -0,0 +1,20 @@ +--- Mesa/bin/mklib.orig 2006-06-04 20:56:22.000000000 -0600 ++++ Mesa/bin/mklib 2006-06-04 20:57:04.000000000 -0600 +@@ -98,6 +98,9 @@ + -L*) + DEPS="$DEPS $1" + ;; ++ -Wl*) ++ DEPS="$DEPS $1" ++ ;; + '-cplusplus') + CPLUSPLUS=1 + ;; +--- Mesa/configs/default.orig 2006-06-04 21:01:47.000000000 -0600 ++++ Mesa/configs/default 2006-06-04 21:01:16.000000000 -0600 +@@ -71,4 +71,4 @@ + GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm + GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm + GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 +-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm ++APP_LIB_DEPS = -L$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm |