From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Evgeny Sinelnikov Subject: Fwd: Re: [devel] GCC_VERSION Date: Sat, 11 Sep 2004 21:58:51 +0400 User-Agent: KMail/1.6.2 To: gcc@packages.altlinux.org MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_bzzQBe4CcvlqOdq" Message-Id: <200409112158.51368.sin@altlinux.ru> X-AntiVirus: checked by AntiVir MailGate (version: 2.0.1.16; AVE: 6.27.0.6; VDF: 6.27.0.54; host: ns.sgu.ru) Cc: ALT Devel discussion list X-BeenThere: devel@altlinux.ru X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Sep 2004 17:50:44 -0000 Archived-At: List-Archive: List-Post: --Boundary-00=_bzzQBe4CcvlqOdq Content-Type: text/plain; charset="koi8-r" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable =FA=C4=D2=C1=D7=D3=D4=D7=D5=CA=D4=C5, =D0=CF=D3=CC=C5 =CE=C5=CB=CF=D4=CF=D2=CF=C7=CF =C1=CE=C1=CC=C9=DA=C1, =CE= =C1=DB=C5=CC =D2=C5=DB=C5=CE=C9=C5 =C4=CC=D1 =CE=C9=D6=C5=D0=D2=C9=D7=C5=C4= =C5=CE=CE=CF=C7=CF. * Sat Sep 11 2004 Evgeny Sinelnikov 1.4.4-alt1 - Changed gcc_wrapper to canonical 4-digit form compatibility. =F0=C5=D2=C5=D3=CF=C2=D2=C1=CC gcc-common =D3=CF =D7=D4=CF=D2=D9=CD =C9=DA= =D0=C1=D4=DE=C5=CA. ---------- =F0=C5=D2=C5=D3=CC=C1=CE=CE=CF=C5 =D3=CF=CF=C2=DD=C5=CE=C9=C5= ---------- Subject: Re: [devel] GCC_VERSION Date: 11 =F3=C5=CE=D4=D1=C2=D2=D8 2004 15:08 From: Evgeny Sinelnikov To: ALT Devel discussion list =F7 =D3=CF=CF=C2=DD=C5=CE=C9=C9 =CF=D4 11 =F3=C5=CE=D4=D1=C2=D2=D8 2004 0= 3:06 Evgeny Sinelnikov =CE=C1=D0=C9=D3=C1=CC(a): > =F7 =D3=CF=CF=C2=DD=C5=CE=C9=C9 =CF=D4 10 =F3=C5=CE=D4=D1=C2=D2=D8 2004= 12:43 Evgeny Sinelnikov =CE=C1=D0=C9=D3=C1=CC(a): > > =F0=D2=C9=D7=C5=D4 =D7=D3=C5=CD! > > =F7=CF =D7=D2=C5=CD=D1 =D3=C2=CF=D2=CB=C9 rtai =CE=C1=D4=CB=CE=D5=CC=D3= =D1 =CE=C1 =D4=C1=CB=D5=C0 =CF=DB=C9=C2=CB=D5: > > /usr/bin/i586-alt-linux-gcc-0303: No such file or directory > > > > =EE=C5 =D1=D3=CE=CF =C7=C4=C5 =C9 =CB=C1=CB =D0=D2=CF=C9=DA=D7=CF=C4=C9= =D4=D3=D1 =D0=CF=C4=D3=D4=D1=CE=CF=D7=CB=C1 gcc. =EB=D5=C4=C1 =CB=CF=D0=C1= =D4=D8? > > =F4=C1=CB =D7=D3=A3 =CE=C1=DB=C5=CC: gcc_wrapper.c: > =C2=D5=C4=D5 =D2=C1=DA=C2=C9=D2=C1=D4=D8=D3=D1, =CF=D4=CB=D5=C4=C1 =D7=D9= =C8=CF=C4=C9=D4 =C2=D5=C4=D4=CF GCC_VERSION=3D0303... =F4=C1=CB =D1 =D2=C1=DA=CF=C2=D2=C1=CC=D3=D1, =D7=D2=CF=C4=C5, =C7=C4=C5 = =D0=D2=C9=DE=C9=CE=C1 - =CB=CF=CE=C6=CC=C9=CB=D4 =C9=CD=A3=CE. /usr/src/linux-2.6.8.1-rt26-up/arch/i386/Makefile: ... GCC_VERSION :=3D $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.s= h $(CC)) ... =F3=D4=D2=C1=CE=CE=CF, =D0=CF=DE=C5=CD=D5 =CF=CE=CF =D7=CF =D7=D2=C5=CD=D1= =D3=C2=CF=D2=CB=C9 =D1=C4=D2=C1 =CE=C5 =CD=C5=DB=C1=C5=D4? Sin _______________________________________________ Devel mailing list Devel@altlinux.ru https://lists.altlinux.ru/mailman/listinfo/devel ------------------------------------------------------- --Boundary-00=_bzzQBe4CcvlqOdq Content-Type: text/x-diff; charset="koi8-r"; name="gcc_wrapper.c-2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gcc_wrapper.c-2.patch" --- gcc_wrapper.c.orig 2004-03-07 03:22:40 +0300 +++ gcc_wrapper.c 2004-09-11 21:10:09 +0400 @@ -15,6 +15,7 @@ const char *call_name = __progname; const char *version = getenv ("GCC_VERSION"); const char *use_ccache = getenv ("GCC_USE_CCACHE"); + int major, minor; if (!strcmp (__progname, "gcc_wrapper")) error (EXIT_FAILURE, 0, "try gcc instead"); @@ -37,8 +38,19 @@ if (version && *version) { - if (asprintf (&suffix, "-%s", version) < 0) - error (EXIT_FAILURE, errno, "asprintf"); + if (sscanf (version, "%d.%d", &major, &minor) == 2) + { + if (asprintf (&suffix, "-%d.%d", major, minor) < 0) + error (EXIT_FAILURE, errno, "asprintf"); + } else + if (sscanf (version, "%2d%2d", &major, &minor) == 2) + { + if (asprintf (&suffix, "-%d.%d", major, minor) < 0) + error (EXIT_FAILURE, errno, "asprintf"); + } else { + if (asprintf (&suffix, "-%s", version) < 0) + error (EXIT_FAILURE, errno, "asprintf"); + } } if (asprintf (&target_name, "%s-%s%s", TARGET, call_name, suffix) < 0) --Boundary-00=_bzzQBe4CcvlqOdq Content-Type: text/x-diff; charset="koi8-r"; name="gcc_wrapper.c-1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gcc_wrapper.c-1.patch" --- gcc_wrapper.c.orig 2004-03-07 03:22:40 +0300 +++ gcc_wrapper.c 2004-09-11 20:46:43 +0400 @@ -15,6 +15,7 @@ const char *call_name = __progname; const char *version = getenv ("GCC_VERSION"); const char *use_ccache = getenv ("GCC_USE_CCACHE"); + int major, minor; if (!strcmp (__progname, "gcc_wrapper")) error (EXIT_FAILURE, 0, "try gcc instead"); @@ -37,8 +38,19 @@ if (version && *version) { - if (asprintf (&suffix, "-%s", version) < 0) - error (EXIT_FAILURE, errno, "asprintf"); + if (sscanf (version, "%d.%d", &major, &minor) == 2) + { + if (asprintf (&suffix, "-%s", version) < 0) + error (EXIT_FAILURE, errno, "asprintf"); + } else + if (sscanf (version, "%2d%2d", &major, &minor) == 2) + { + if (asprintf (&suffix, "-%d.%d", major, minor) < 0) + error (EXIT_FAILURE, errno, "asprintf"); + } else { + if (asprintf (&suffix, "-%s", version) < 0) + error (EXIT_FAILURE, errno, "asprintf"); + } } if (asprintf (&target_name, "%s-%s%s", TARGET, call_name, suffix) < 0) --Boundary-00=_bzzQBe4CcvlqOdq--