diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-27 00:28:32 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-27 00:28:32 +0000 |
| commit | 92ebb2b6111ffb471dd5eab36bf16270fb73e846 (patch) | |
| tree | 6bb47a3188aa3480b94cb77e4f45f58306e4bca7 /packages/mesa/mesa-6.5.2 | |
| parent | 866f8bbaacccba1013592256764c0444df84a0f8 (diff) | |
| parent | 7cc5981f6564d5a3299b02faa2443bd461ec6cea (diff) | |
merge of 'c2f07abcb38cb67e8a16b3f8ace024bdd602d8ea'
and 'cda98b5f7e614937fbdf5a3be7767b63019ac50d'
Diffstat (limited to 'packages/mesa/mesa-6.5.2')
| -rw-r--r-- | packages/mesa/mesa-6.5.2/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/mesa/mesa-6.5.2/mklib-rpath-link.patch | 23 |
2 files changed, 23 insertions, 0 deletions
diff --git a/packages/mesa/mesa-6.5.2/.mtn2git_empty b/packages/mesa/mesa-6.5.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mesa/mesa-6.5.2/.mtn2git_empty diff --git a/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch b/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch new file mode 100644 index 0000000000..e59513abfe --- /dev/null +++ b/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch @@ -0,0 +1,23 @@ +--- 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-6.5.2/configs/default.old 2007-01-26 11:49:32.000000000 +0000 ++++ Mesa-6.5.2/configs/default 2007-01-26 11:49:49.000000000 +0000 +@@ -73,7 +73,7 @@ + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm + GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm + GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm + + + |