From 90520f9b43eb2e11829fdf27c269b22f421b8e63 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Tue, 2 Sep 2014 09:16:54 +0200 Subject: [PATCH] Second attempt at fixing non-bootstrap ARM build - Revert the change to BuildFeature since the latest version of the zlib sources package indeed uses the correct "sources" directory. - Make the fake zlib package for ARM use the same revision number as the current zlib version (4) so it can use the current version of the source package instead of some older one. --- build/jam/BuildFeatures | 2 +- build/jam/repositories/HaikuPorts/arm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures index e9fe8fe494..7e0be56af3 100644 --- a/build/jam/BuildFeatures +++ b/build/jam/BuildFeatures @@ -438,7 +438,7 @@ if [ IsPackageAvailable zlib_devel ] { # sources are required for the primary architecture only primary @{ file: source zlib_source - sources: develop/sources/%portRevisionedName%/source + sources: develop/sources/%portRevisionedName%/sources }@ ; diff --git a/build/jam/repositories/HaikuPorts/arm b/build/jam/repositories/HaikuPorts/arm index b5be558b99..216bbf59df 100644 --- a/build/jam/repositories/HaikuPorts/arm +++ b/build/jam/repositories/HaikuPorts/arm @@ -22,8 +22,8 @@ RemotePackageRepository HaikuPorts icu_devel-4.8.1.1-1 libsolv-0.3.0_haiku_2013_10_01-1 libsolv_devel-0.3.0_haiku_2013_10_01-1 - zlib-1.2.8-2 - zlib_devel-1.2.8-2 + zlib-1.2.8-4 + zlib_devel-1.2.8-4 : # source packages