[haiku-commits] BRANCH HaikuPM-github.package-management [4d6fe71] build/jam
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 26 Apr 2013 01:45:30 +0200 (CEST)
added 2 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: 13321f4d4b7760bf58faec2b2ffef234a99631ab
new head: 4d6fe712e00933ce87a40731bc8f8eadacb18261
overview: https://github.com/haiku/HaikuPM/compare/13321f4...4d6fe71
----------------------------------------------------------------------------
603c764: Update openssl package
4d6fe71: Update sqlite package (fix pkgconfig)
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 8 insertions(+), 7 deletions(-)
build/jam/OptionalBuildFeatures | 13 +++++++------
build/jam/OptionalPackages | 2 +-
############################################################################
Commit: 603c7647a0a04f729a15d118e308c91aa23bdd86
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Thu Apr 25 23:39:55 2013 UTC
Update openssl package
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 46211c7..f17e648a 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -14,7 +14,7 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0e-x86-gcc4-2011-09-08.zip ;
} else {
- HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-4-x86_gcc2.hpkg ;
+ HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-1-x86_gcc2.hpkg ;
}
local baseURL = http://haiku-files.org/files/optional-packages ;
@@ -25,7 +25,7 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
if $(TARGET_ARCH) != x86 {
Echo "SSL build feature not available for $(TARGET_ARCH)" ;
} else {
- # Download the zip archive.
+ # Download the package.
local zipFile = [ DownloadFile $(HAIKU_OPENSSL_PACKAGE)
: $(HAIKU_OPENSSL_URL) ] ;
@@ -36,19 +36,20 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
# extract headers and libraries
HAIKU_OPENSSL_HEADERS_DEPENDENCY = [ ExtractArchive
$(HAIKU_OPENSSL_DIR)
- : include/ : $(zipFile) : extracted-openssl
+ : develop/headers/ : $(zipFile) : extracted-openssl
] ;
HAIKU_OPENSSL_LIBS = [ ExtractArchive $(HAIKU_OPENSSL_DIR)
:
- lib/libcrypto.so
- lib/libssl.so
+ develop/lib/libcrypto.so
+ develop/lib/libssl.so
: $(zipFile)
: extracted-openssl
] ;
HAIKU_OPENSSL_ENABLED = 1 ;
- HAIKU_OPENSSL_HEADERS = [ FDirName $(HAIKU_OPENSSL_DIR) include
] ;
+ HAIKU_OPENSSL_HEADERS
+ = [ FDirName $(HAIKU_OPENSSL_DIR) develop/headers ] ;
}
}
############################################################################
Commit: 4d6fe712e00933ce87a40731bc8f8eadacb18261
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Thu Apr 25 23:40:34 2013 UTC
Update sqlite package (fix pkgconfig)
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 75c1844..a3f341e 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1291,7 +1291,7 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] {
$(baseURL)/sqlite-3.7.5-r1a3-x86-gcc4-2011-05-24.zip ;
} else {
InstallOptionalHaikuImagePackage
- $(hpkgBaseURL)/sqlite-3.7.13-1-x86_gcc2.hpkg
+ $(hpkgBaseURL)/sqlite-3.7.13-2-x86_gcc2.hpkg
: common packages ;
}
}
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management [4d6fe71] build/jam - HaikuPM-github . package-management
