summaryrefslogtreecommitdiffstats
path: root/debian/patches/01_fix-makefile.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/01_fix-makefile.patch')
-rw-r--r--debian/patches/01_fix-makefile.patch18
1 files changed, 0 insertions, 18 deletions
diff --git a/debian/patches/01_fix-makefile.patch b/debian/patches/01_fix-makefile.patch
index f599d8438e1..6711d2fe5cd 100644
--- a/debian/patches/01_fix-makefile.patch
+++ b/debian/patches/01_fix-makefile.patch
@@ -1,11 +1,7 @@
Do not build OSMesa for a standalone configuration, since Debian only ships
OSMesa in a separate package.
-Fix Mesa makefile to install the libGL and libOSMesa libraries when they
-exist, not only depending on configuration.
-
This patch by Thierry Reding.
-Hunk #2 submitted to Mesa and applied (post 6.5.1).
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -18,17 +14,3 @@ Hunk #2 submitted to Mesa and applied (post 6.5.1).
osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
-@@ -154,7 +154,12 @@
- $(INSTALL) -d $(INSTALL_DIR)/include/GL
- $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
- $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
-- $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGL.* $(INSTALL_DIR)/$(LIB_DIR)
-+ @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
-+ $(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(GL_LIB).* $(INSTALL_DIR)/$(LIB_DIR); \
-+ fi
-+ @if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
-+ $(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(OSMESA_LIB).* $(INSTALL_DIR)/$(LIB_DIR); \
-+ fi
- @if [ "${DRIVER_DIRS}" = "dri" ] ; then \
- cd drivers/dri ; $(MAKE) install ; \
- fi