[mesalib] cleanup patches

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

9 files changed, 48 insertions, 209 deletions

diff --git a/patches/MesaLib-7.8.2/0001-remove-crosscompile-check.patch b/patches/MesaLib-7.8.2/0001-remove-crosscompile-check.patch
index e94f2a4d3..4a7e170c9 100644
--- a/patches/MesaLib-7.8.2/0001-remove-crosscompile-check.patch
+++ b/patches/MesaLib-7.8.2/0001-remove-crosscompile-check.patch
@@ -1,7 +1,6 @@
-From b1f388870b1a128b652273981fa862c0a09cbdf0 Mon Sep 17 00:00:00 2001
 From: Erwin Rol <erwin@erwinrol.com>
 Date: Wed, 7 Jul 2010 10:57:40 +0200
-Subject: [PATCH 1/4] remove crosscompile check
+Subject: [PATCH] remove crosscompile check
 
 When cross compiling it refuses to use assembly since it assumes it can
 not use the gen_matypes tool. But we fixed the gen_matypes so now the
diff --git a/patches/MesaLib-7.8.2/0002-add-linker-option-to-mklib-call.patch b/patches/MesaLib-7.8.2/0002-add-linker-option-to-mklib-call.patch
new file mode 100644
index 000000000..fc6ae0902
--- /dev/null
+++ b/patches/MesaLib-7.8.2/0002-add-linker-option-to-mklib-call.patch
@@ -0,0 +1,42 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Fri, 9 Jul 2010 13:35:14 +0200
+Subject: [PATCH] add linker option to mklib call
+
+When cross compiling, we have to handle the (cross-)linker to the mklib
+call.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/gallium/winsys/drm/i965/xorg/Makefile  |    2 +-
+ src/gallium/winsys/drm/intel/xorg/Makefile |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/winsys/drm/i965/xorg/Makefile b/src/gallium/winsys/drm/i965/xorg/Makefile
+index c25726b..3e00035 100644
+--- a/src/gallium/winsys/drm/i965/xorg/Makefile
++++ b/src/gallium/winsys/drm/i965/xorg/Makefile
+@@ -35,7 +35,7 @@ TARGET_STAGING = $(TOP)/$(LIB_DIR)/gallium/$(TARGET)
+ all default: $(TARGET) $(TARGET_STAGING)
+ 
+ $(TARGET): $(OBJECTS) Makefile $(GALLIUMDIR)/state_trackers/xorg/libxorgtracker.a $(LIBS)
+-	$(TOP)/bin/mklib -noprefix -o $@ \
++	$(TOP)/bin/mklib -noprefix -linker '$(CC)' -o $@ \
+ 	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel
+ 
+ $(TOP)/$(LIB_DIR)/gallium:
+diff --git a/src/gallium/winsys/drm/intel/xorg/Makefile b/src/gallium/winsys/drm/intel/xorg/Makefile
+index 14c2462..ad44715 100644
+--- a/src/gallium/winsys/drm/intel/xorg/Makefile
++++ b/src/gallium/winsys/drm/intel/xorg/Makefile
+@@ -34,7 +34,7 @@ DRIVER_DEFINES = \
+ all default: $(TARGET)
+ 
+ $(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)
+-	$(TOP)/bin/mklib -noprefix -o $@ \
++	$(TOP)/bin/mklib -noprefix -linker '$(CC)' -o $@ \
+ 	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel
+ 
+ clean:
+-- 
+1.7.1
+
diff --git a/patches/MesaLib-7.8.2/0002-fix-mklib-command-line.patch b/patches/MesaLib-7.8.2/0002-fix-mklib-command-line.patch
deleted file mode 100644
index a0c4ce761..000000000
--- a/patches/MesaLib-7.8.2/0002-fix-mklib-command-line.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 033a043a48b3dc5e1a0b924e5dd5b78690e84ea1 Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 7 Jul 2010 10:57:40 +0200
-Subject: [PATCH 2/4] fix mklib command line
-
-during configure the environment variable MKLIB_OPTIONS can be used to
-specify extra options for mklib. This variable is not used everywhere.
-This patch fixes this.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/gallium/winsys/drm/Makefile.template |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/gallium/winsys/drm/Makefile.template b/src/gallium/winsys/drm/Makefile.template
-index f4cc0de..74e769c 100644
---- a/src/gallium/winsys/drm/Makefile.template
-+++ b/src/gallium/winsys/drm/Makefile.template
-@@ -65,7 +65,7 @@ default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
- 
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) Makefile \
- 		$(TOP)/src/mesa/drivers/dri/Makefile.template
--	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-+	$(MKLIB) -o $@ $(MKLIB_OPTIONS) -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
- 		$(OBJECTS) $(PIPE_DRIVERS) \
-                 -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
-                  $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
--- 
-1.7.1
-
diff --git a/patches/MesaLib-7.8.2/0004-HACK-allow-compiling-host-tools-without-configure.patch b/patches/MesaLib-7.8.2/0003-HACK-allow-compiling-host-tools-without-configure.patch
index 3f18a6663..8d9fbf323 100644
--- a/patches/MesaLib-7.8.2/0004-HACK-allow-compiling-host-tools-without-configure.patch
+++ b/patches/MesaLib-7.8.2/0003-HACK-allow-compiling-host-tools-without-configure.patch
@@ -1,7 +1,6 @@
-From bcf6de73e080d662b28381e4eb3dfcc7eb0ce8f7 Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Wed, 7 Jul 2010 10:58:14 +0200
-Subject: [PATCH 4/4] HACK: allow compiling host tools without configure
+Subject: [PATCH] HACK: allow compiling host tools without configure
 
 This patch modifies the Makefiles for the hosttools to allow
 compiling without configure. This way we can avoid
diff --git a/patches/MesaLib-7.8.2/0003-add-linker-prefix-option-to-mklib.patch b/patches/MesaLib-7.8.2/0003-add-linker-prefix-option-to-mklib.patch
deleted file mode 100644
index 31df5aacd..000000000
--- a/patches/MesaLib-7.8.2/0003-add-linker-prefix-option-to-mklib.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From af051dc63f474c532be558410bc560d67a381003 Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 7 Jul 2010 10:57:40 +0200
-Subject: [PATCH 3/4] add -linker-prefix option to mklib
-
-On Linux mklib uses gcc or g++ (for C++) as linker. This breaks when
-cross-compiling. The "-linker" option cannot be used, because it cannot be
-used to specify a differen linker for C and C++.
-This patch adds an extra option to add a prefix for the linker command.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- bin/mklib |    9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/bin/mklib b/bin/mklib
-index 08ef99e..b922ef1 100755
---- a/bin/mklib
-+++ b/bin/mklib
-@@ -137,6 +137,7 @@ MINOR=0
- PATCH=""
- DEPS=""
- LINK=""
-+LINK_PREFIX=""
- LDFLAGS=""
- CPLUSPLUS=0
- STATIC=0
-@@ -178,6 +179,10 @@ do
- 	    shift 1;
- 	    LINK=$1
- 	    ;;
-+	'-linker-prefix')
-+	    shift 1;
-+	    LINK_PREFIX=$1
-+	    ;;
- 	'-ldflags')
- 	    shift 1;
- 	    LDFLAGS=$1
-@@ -313,9 +318,9 @@ case $ARCH in
- 	if [ "x$LINK" = "x" ] ; then
- 	    # -linker was not specified so set default link command now
-             if [ $CPLUSPLUS = 1 ] ; then
--                LINK=g++
-+                LINK=${LINK_PREFIX}g++
-             else
--                LINK=gcc
-+                LINK=${LINK_PREFIX}gcc
-             fi
- 	fi
- 
--- 
-1.7.1
-
diff --git a/patches/MesaLib-7.8.2/add-mklib-option.diff b/patches/MesaLib-7.8.2/add-mklib-option.diff
deleted file mode 100644
index dc218875b..000000000
--- a/patches/MesaLib-7.8.2/add-mklib-option.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Subject: add -linker-prefix option to mklib
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-
-On Linux mklib uses gcc or g++ (for C++) as linker. This breaks when
-cross-compiling. The "-linker" option cannot be used, because it cannot be
-used to specify a differen linker for C and C++.
-This patch adds an extra option to add a prefix for the linker command.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- bin/mklib |   11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-Index: b/bin/mklib
-===================================================================
---- a/bin/mklib
-+++ b/bin/mklib
-@@ -34,6 +34,7 @@ MINOR=0
- PATCH=""
- DEPS=""
- LINK=""
-+LINK_PREFIX=""
- LDFLAGS=""
- CPLUSPLUS=0
- STATIC=0
-@@ -99,6 +100,10 @@ do
- 	    shift 1;
- 	    LINK=$1
- 	    ;;
-+	'-linker-prefix')
-+	    shift 1;
-+	    LINK_PREFIX=$1
-+	    ;;
- 	'-ldflags')
- 	    shift 1;
- 	    LDFLAGS=$1
-@@ -234,9 +239,9 @@ case $ARCH in
- 	if [ "x$LINK" = "x" ] ; then
- 	    # -linker was not specified so set default link command now
-             if [ $CPLUSPLUS = 1 ] ; then
--                LINK=g++
-+                LINK=${LINK_PREFIX}g++
-             else
--                LINK=gcc
-+                LINK=${LINK_PREFIX}gcc
-             fi
- 	fi
- 
diff --git a/patches/MesaLib-7.8.2/configure.ac.diff b/patches/MesaLib-7.8.2/configure.ac.diff
deleted file mode 100644
index 6ffec837e..000000000
--- a/patches/MesaLib-7.8.2/configure.ac.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Subject: remove crosscompile check
-From: Erwin Rol <erwin@erwinrol.com>
-
-When cross compiling it refuses to use assembly since it assumes it can
-not use the gen_matypes tool. But we fixed the gen_matypes so now the
-test is not needed anymore.
-
-Signed-off-by: Erwin Rol <erwin@erwinrol.com>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
-v1: written by Erwin Rol
-v2: ported to Mesa-7.5 by Marc Kleine-Budde
-
- configure.ac |   16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-Index: Mesa-7.5/configure.ac
-===================================================================
---- Mesa-7.5.orig/configure.ac
-+++ Mesa-7.5/configure.ac
-@@ -269,14 +269,14 @@ GLAPI_ASM_SOURCES=""
- AC_MSG_CHECKING([whether to enable assembly])
- test "x$enable_asm" = xno && AC_MSG_RESULT([no])
- # disable if cross compiling on x86/x86_64 since we must run gen_matypes
--if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then
--    case "$host_cpu" in
--    i?86 | x86_64)
--        enable_asm=no
--        AC_MSG_RESULT([no, cross compiling])
--        ;;
--    esac
--fi
-+#if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then
-+#    case "$host_cpu" in
-+#    i?86 | x86_64)
-+#        enable_asm=no
-+#        AC_MSG_RESULT([no, cross compiling])
-+#        ;;
-+#    esac
-+#fi
- # check for supported arches
- if test "x$enable_asm" = xyes; then
-     case "$host_cpu" in
diff --git a/patches/MesaLib-7.8.2/fix-mklib-cmdline.diff b/patches/MesaLib-7.8.2/fix-mklib-cmdline.diff
deleted file mode 100644
index a3fc079b8..000000000
--- a/patches/MesaLib-7.8.2/fix-mklib-cmdline.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: fix mklib command line
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-
-during configure the environment variable MKLIB_OPTIONS can be used to
-specify extra options for mklib. This variable is not used everywhere.
-This patch fixes this.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- src/gallium/winsys/drm/Makefile.template |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/src/gallium/winsys/drm/Makefile.template
-===================================================================
---- a/src/gallium/winsys/drm/Makefile.template
-+++ b/src/gallium/winsys/drm/Makefile.template
-@@ -65,7 +65,7 @@ default: depend symlinks $(TOP)/$(LIB_DI
- 
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) Makefile \
- 		$(TOP)/src/mesa/drivers/dri/Makefile.template
--	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-+	$(MKLIB) -o $@ $(MKLIB_OPTIONS) -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
- 		$(OBJECTS) $(PIPE_DRIVERS) \
-                 -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
-                  $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
diff --git a/patches/MesaLib-7.8.2/series b/patches/MesaLib-7.8.2/series
index 4657c4ef7..69ee29fbe 100644
--- a/patches/MesaLib-7.8.2/series
+++ b/patches/MesaLib-7.8.2/series
@@ -1,4 +1,5 @@
+# generated by git-ptx-patches
 0001-remove-crosscompile-check.patch
-0002-fix-mklib-command-line.patch
-0003-add-linker-prefix-option-to-mklib.patch
-0004-HACK-allow-compiling-host-tools-without-configure.patch
+0002-add-linker-option-to-mklib-call.patch
+0003-HACK-allow-compiling-host-tools-without-configure.patch
+# 57f02633d9553fe7ee434b1e860f6099  - git-ptx-patches magic