X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=wine-notarget.patch;h=92f7cd270a9af0996b8d195c37f9641f18e5b20a;hb=6ebf503eb54a62786660dd7dba5cd82e75fdfe24;hp=2a64eaa5fb7993a161040b95e0d5ab6239151163;hpb=2877d0e08f79284c56a29574874a69d5dfea3504;p=packages%2Fwine.git

diff --git a/wine-notarget.patch b/wine-notarget.patch
index 2a64eaa..92f7cd2 100644
--- a/wine-notarget.patch
+++ b/wine-notarget.patch
@@ -1,58 +1,12 @@
---- wine-1.1.15/tools/winegcc/winegcc.c~	2009-02-13 18:01:33.000000000 +0100
-+++ wine-1.1.15/tools/winegcc/winegcc.c	2009-02-25 14:37:44.743493303 +0100
-@@ -302,8 +302,7 @@
-         else str = CXX;
+--- wine-1.1.36/tools/winegcc/winegcc.c.orig	2010-01-08 20:20:11.000000000 +0100
++++ wine-1.1.36/tools/winegcc/winegcc.c	2010-01-19 00:19:19.000000000 +0100
+@@ -289,8 +289,7 @@
          break;
+     case proc_cc:
      case proc_as:
--        if (opts->target) str = strmake( "%s-as", opts->target );
--        else str = AS;
-+        str = AS;
+-        if (opts->target) str = strmake( "%s-gcc", opts->target );
+-        else str = CC;
++        str = CC;
          break;
-     default:
-         assert(0);
---- wine-1.1.15/tools/winebuild/utils.c~	2009-02-13 18:01:33.000000000 +0100
-+++ wine-1.1.15/tools/winebuild/utils.c	2009-02-25 14:52:51.450410422 +0100
-@@ -250,13 +250,6 @@
- {
-     if (!as_command)
-     {
--        if (target_alias)
--        {
--            as_command = xmalloc( strlen(target_alias) + sizeof("-as") );
--            strcpy( as_command, target_alias );
--            strcat( as_command, "-as" );
--        }
--        else
-         {
-             static const char * const commands[] = { "gas", "as", NULL };
-             if (!(as_command = find_tool( commands ))) as_command = xstrdup("as");
---- wine-1.1.15/tools/winebuild/utils.c~	2009-02-25 14:53:45.976730869 +0100
-+++ wine-1.1.15/tools/winebuild/utils.c	2009-02-25 14:56:43.257219329 +0100
-@@ -269,13 +269,6 @@
- {
-     if (!ld_command)
-     {
--        if (target_alias)
--        {
--            ld_command = xmalloc( strlen(target_alias) + sizeof("-ld") );
--            strcpy( ld_command, target_alias );
--            strcat( ld_command, "-ld" );
--        }
--        else
-         {
-             static const char * const commands[] = { "ld", "gld", NULL };
-             if (!(ld_command = find_tool( commands ))) ld_command = xstrdup("ld");
-@@ -295,13 +288,6 @@
- {
-     if (!nm_command)
-     {
--        if (target_alias)
--        {
--            nm_command = xmalloc( strlen(target_alias) + sizeof("-nm") );
--            strcpy( nm_command, target_alias );
--            strcat( nm_command, "-nm" );
--        }
--        else
-         {
-             static const char * const commands[] = { "nm", "gnm", NULL };
-             if (!(nm_command = find_tool( commands ))) nm_command = xstrdup("nm");
+     case proc_cxx:
+         if (opts->target) str = strmake( "%s-g++", opts->target );