[haiku-commits] Re: haiku: hrev44266 - build/jam
- From: Urias McCullough <umccullough@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 25 Jun 2012 15:27:18 -0700
On Mon, Jun 25, 2012 at 2:17 PM, scott mc <scottmc2@xxxxxxxxx> wrote:
> local baseURL = http://haiku-files.org/files/optional-packages ;
> @@ -339,9 +339,9 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
> if $(TARGET_ARCH) = ppc {
> HAIKU_FREETYPE_FILE = freetype-2.4.6-ppc-gcc4-2012-03-17.zip ;
> } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
> - HAIKU_FREETYPE_FILE = freetype-2.4.6-x86-gcc4-2012-03-15.zip ;
> + HAIKU_FREETYPE_FILE = freetype-2.4.9-x86-gcc4-2012-06-15.zip ;
> } else {
> - HAIKU_FREETYPE_FILE = freetype-2.4.6-x86-gcc2-2012-03-15.zip ;
> + HAIKU_FREETYPE_FILE = freetype-2.4.9-x86-gcc2-2012-06-15.zip ;
> }
It seems the gcc2 version of the new zip is missing.
> local freetypeZipFile = [ DownloadFile $(HAIKU_FREETYPE_FILE)
> @@ -361,7 +361,7 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
> : extracted-freetype ] ;
> HAIKU_FREETYPE_CURRENT_LIB = [ ExtractArchive $(HAIKU_FREETYPE_DIR)
> :
> - common/lib/libfreetype.so.6.7.1
> + common/lib/libfreetype.so.6.8.1
This fails with the PPC target - better make it conditional since you
haven't updated the ppc zip yet.
- Urias
Other related posts:
