[haiku-commits] Re: r38961 - haiku/trunk/build/jam
- From: Matt Madia <mattmadia@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 5 Mar 2011 19:20:40 +0000
Sorry for digging up a very old changeset...
On Wed, Oct 13, 2010 at 06:11, scott mc <scottmc2@xxxxxxxxx> wrote:
> Author: scottmc
> Date: 2010-10-13 08:11:51 +0200 (Wed, 13 Oct 2010)
> New Revision: 38961
> Changeset: http://dev.haiku-os.org/changeset/38961
>
> Modified:
> haiku/trunk/build/jam/OptionalPackages
> Log:
> Updated apr-util, cmake, curl, sqlite and subversion optionalpackages.
>
>
> Modified: haiku/trunk/build/jam/OptionalPackages
> ===================================================================
> --- haiku/trunk/build/jam/OptionalPackages 2010-10-13 05:44:52 UTC (rev
> 38960)
> +++ haiku/trunk/build/jam/OptionalPackages 2010-10-13 06:11:51 UTC (rev
> 38961)
> @@ -110,15 +110,11 @@
> if $(TARGET_ARCH) != x86 {
> Echo "No optional package APR available for $(TARGET_ARCH)" ;
> } else {
> - InstallOptionalHaikuImagePackage
> apr-1.4.2-r1a2-x86-gcc2-2010-04-22-a.zip
> - : $(baseURL)/apr-1.4.2-r1a2-x86-gcc2-2010-04-22-a.zip
> + InstallOptionalHaikuImagePackage
> apr-1.4.2-x86-gcc2-2010-10-13.zip
> + : $(baseURL)/apr-1.4.2-x86-gcc2-2010-10-13.zip
> :
> : true
> - : true
> ;
> @@ -129,15 +125,11 @@
> Echo "No optional package APR-util available for
> $(TARGET_ARCH)" ;
> } else {
> InstallOptionalHaikuImagePackage
> - apr-util-1.3.9-r1a2-x86-gcc2-2010-04-22-a.zip
> - :
> $(baseURL)/apr-util-1.3.9-r1a2-x86-gcc2-2010-04-22-a.zip
> + apr-util-1.3.10-x86-gcc2-2010-10-13.zip
> + : $(baseURL)/apr-util-1.3.10-x86-gcc2-2010-10-13.zip
> :
> : true
> - : true
> ;
> @@ -448,10 +440,9 @@
> Echo "No optional package Curl available for $(TARGET_ARCH)" ;
> } else {
> InstallOptionalHaikuImagePackage
> - curl-7.21.1-x86-gcc2-2010-08-13.zip
> - : $(baseURL)/curl-7.21.1-x86-gcc2-2010-08-13.zip
> + curl-7.21.2-x86-gcc2-2010-10-13.zip
> + : $(baseURL)/curl-7.21.2-x86-gcc2-2010-10-13.zip
> :
> - :
> : true
> ;
> @@ -1376,10 +1367,9 @@
> Echo "No optional package SQLite available for $(TARGET_ARCH)"
> ;
> } else {
> InstallOptionalHaikuImagePackage
> - sqlite-3.6.23-r1a2-x86-gcc2-2010-04-22-a.zip
> - :
> $(baseURL)/sqlite-3.6.23-r1a2-x86-gcc2-2010-04-22-a.zip
> + sqlite-3.7.3-x86-gcc2-2010-10-13.zip
> + : $(baseURL)/sqlite-3.7.3-x86-gcc2-2010-10-13.zip
> :
> - :
> : true
> ;
> @@ -1392,11 +1382,10 @@
> Echo "No optional package Subversion available for
> $(TARGET_ARCH)" ;
> } else {
> InstallOptionalHaikuImagePackage
> - subversion-1.6.9-r1a2-x86-gcc2-2010-04-28-a.zip
> - :
> $(baseURL)/subversion-1.6.9-r1a2-x86-gcc2-2010-04-28-a.zip
> + subversion-1.6.13-x86-gcc2-2010-10-13.zip
> + : $(baseURL)/subversion-1.6.13-x86-gcc2-2010-10-13.zip
> :
> : true
> - : true
> ;
Scott, you deleted some lines, which did one of two things
1. shifted the ": true" for isGCCAgnostic to become a new argument
for isCDPackage.
2. simply deleted the argument being passed for isGCCAgnostic
rule InstallOptionalHaikuImagePackage
package
: url
: dirTokens
: isCDPackage
: isGCCAgnostic
Was there a particular reason for this?
One of the effects is that on r40819's ISO image, several packages
(including Web+'s dependencies) are stored as zips in _packages_/
Back in r36441, stippi made curl, libxml, and sqlite to not pass a
variable for isCDPackage -- thus, enabling Web+ to run on a LiveCD
(ISO).
--mmadia
Other related posts:
