[haiku-commits] Re: r41322 - haiku/trunk/build/jam

  • From: scottmc <scottmc2@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 5 May 2011 18:13:18 -0700

If you look at the commit i didn't update the package... it's from 2 months
ago!  I was simply cleaning it up and letting gcc2 builds use the same
version as the gcc4 builds.
XZ-utils fails to build with gcc2 but works ok on gcc2 systems.
Sorry for top post.... no option to quote and bottom post on android i
guess.
-scottmc

On May 5, 2011 11:47 AM, "scott mc" <scottmc2@xxxxxxxxx> wrote:
> Author: scottmc
> Date: 2011-05-05 20:47:15 +0200 (Thu, 05 May 2011)
> New Revision: 41322
> Changeset: https://dev.haiku-os.org/changeset/41322
>
> Modified:
> haiku/trunk/build/jam/OptionalPackages
> Log:
> Updated xz-utils to 5.0.1, removed unneeded if statement as the xz-utils
gcc4 works on both
> gcc2 and gcc4.
>
>
> Modified: haiku/trunk/build/jam/OptionalPackages
> ===================================================================
> --- haiku/trunk/build/jam/OptionalPackages 2011-05-05 18:35:43 UTC (rev
41321)
> +++ haiku/trunk/build/jam/OptionalPackages 2011-05-05 18:47:15 UTC (rev
41322)
> @@ -1696,17 +1696,9 @@
> if $(TARGET_ARCH) != x86 {
> Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ;
> } else {
> - if $(HAIKU_GCC_VERSION[1]) >= 4 {
> - InstallOptionalHaikuImagePackage
> - xz-utils-5.0.1-x86-gcc4-2011-03-16.zip
> - : $(baseURL)/xz-utils-5.0.1-x86-gcc4-2011-03-16.zip ;
> - } else {
> - InstallOptionalHaikuImagePackage
> - xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip
> - : $(baseURL)/xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip ;
> - }
> - InstallSourceArchive xz-utils-4.999.9_haiku-2010-04-29.tar.xz
> - : $(baseSourceURL)/2010/xz-utils-4.999.9_haiku-2010-04-29.tar.xz ;
> + InstallOptionalHaikuImagePackage
> + xz-utils-5.0.1-x86-gcc4-2011-03-16.zip
> + : $(baseURL)/xz-utils-5.0.1-x86-gcc4-2011-03-16.zip ;
> AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
> : "tar -Jtvf \\0045s"
> : "tar -Jxvf \\0045s"
>
>

Other related posts: