hrev51271 adds 1 changeset to branch 'master'
old head: ebe9bc05c55180b64313bdaff1b8450ce90dc904
new head: 51e278c70b60a07a6575965b48393026dc0b522f
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=51e278c70b60+%5Eebe9bc05c551
----------------------------------------------------------------------------
51e278c70b60: Adjust jasper soname for x86_64.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51271
Commit: 51e278c70b60a07a6575965b48393026dc0b522f
URL: http://cgit.haiku-os.org/haiku/commit/?id=51e278c70b60
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Mon Jul 10 20:14:02 2017 UTC
----------------------------------------------------------------------------
1 file changed, 19 insertions(+), 9 deletions(-)
build/jam/BuildFeatures | 28 +++++++++++++++++++---------
----------------------------------------------------------------------------
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 367da69..eb3c34e 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -440,15 +440,25 @@ if [ IsPackageAvailable libicns_devel ] {
# Jasper
if [ IsPackageAvailable jasper_devel ] {
- ExtractBuildFeatureArchives jasper :
- file: base jasper
- runtime: lib
- file: devel jasper_devel
- depends: base
- library: $(developLibDir)/libjasper.so.1
- headers: $(developHeadersDir)
$(developHeadersDir)/jasper
- ;
-
+ if $(HAIKU_PACKAGING_ARCH) = x86_64 {
+ ExtractBuildFeatureArchives jasper :
+ file: base jasper
+ runtime: lib
+ file: devel jasper_devel
+ depends: base
+ library: $(developLibDir)/libjasper.so.4
+ headers: $(developHeadersDir)
$(developHeadersDir)/jasper
+ ;
+ } else {
+ ExtractBuildFeatureArchives jasper :
+ file: base jasper
+ runtime: lib
+ file: devel jasper_devel
+ depends: base
+ library: $(developLibDir)/libjasper.so.1
+ headers: $(developHeadersDir)
$(developHeadersDir)/jasper
+ ;
+ }
EnableBuildFeatures jasper ;
} else {
Echo "Jasper support not available on $(TARGET_PACKAGING_ARCH)" ;
