i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update libsolv package

Browse Source 
Also make use of new build feature rules.
This commit is contained in:
Ingo Weinhold
2013-06-14 00:48:12 +02:00
parent 1d14716b9f
commit a20eb7f497
3 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+14 -19
View File
@@ -623,32 +623,27 @@ if $(TARGET_ARCH) != x86 {
Echo "Libsolv not available for $(TARGET_ARCH)." ; Echo "Libsolv not available for $(TARGET_ARCH)." ;
} else if $(HAIKU_GCC_VERSION[1]) = 2 { } else if $(HAIKU_GCC_VERSION[1]) = 2 {
HAIKU_LIBSOLV_PACKAGE HAIKU_LIBSOLV_PACKAGE
= libsolv-0.3.0_haiku_2013_05_30-1-x86_gcc2.hpkg ; = libsolv-0.3.0_haiku_2013_05_30-2-x86_gcc2.hpkg ;
HAIKU_LIBSOLV_DEVEL_PACKAGE
= libsolv_devel-0.3.0_haiku_2013_05_30-2-x86_gcc2.hpkg ;
} else { } else {
Echo "Libsolv not available for gcc4." ; Echo "Libsolv not available for gcc4." ;
} }
if $(HAIKU_LIBSOLV_PACKAGE) { if $(HAIKU_LIBSOLV_PACKAGE) {
# download package HAIKU_LIBSOLV_URL = $(hpkgBaseURL)/$(HAIKU_LIBSOLV_PACKAGE) ;
HAIKU_LIBSOLV_PACKAGE_FILE = [ DownloadFile $(HAIKU_LIBSOLV_PACKAGE) HAIKU_LIBSOLV_DEVEL_URL = $(hpkgBaseURL)/$(HAIKU_LIBSOLV_DEVEL_PACKAGE) ;
: $(hpkgBaseURL)/$(HAIKU_LIBSOLV_PACKAGE) ] ;
HAIKU_LIBSOLV_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_LIBSOLV_PACKAGE:B) ] ;
# extract headers and libraries ExtractBuildFeatureArchives libsolv :
HAIKU_LIBSOLV_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_LIBSOLV_DIR) file: base $(HAIKU_LIBSOLV_URL)
: develop/headers/ : $(HAIKU_LIBSOLV_PACKAGE_FILE) : extracted-libsolv runtime: lib
] ; file: devel $(HAIKU_LIBSOLV_DEVEL_URL)
depends: base
libraries: develop/lib/libsolv.so develop/lib/libsolvext.so
headers: develop/headers
;
HAIKU_LIBSOLV_LIBS = [ ExtractArchive $(HAIKU_LIBSOLV_DIR) EnableBuildFeatures libsolv ;
:
develop/lib/libsolv.so
develop/lib/libsolvext.so
: $(HAIKU_LIBSOLV_PACKAGE_FILE)
: extracted-libsolv
] ;
HAIKU_LIBSOLV_HEADERS = [ FDirName $(HAIKU_LIBSOLV_DIR) develop/headers ] ;
} }
build/jam/OptionalPackages
+2 -2
View File
@@ -1295,11 +1295,11 @@ if [ IsOptionalHaikuImagePackageAdded Libpng-devel ] {
# LibSolv # LibSolv
if [ IsOptionalHaikuImagePackageAdded LibSolv ] { if [ IsOptionalHaikuImagePackageAdded LibSolv ] {
if ! $(HAIKU_LIBSOLV_PACKAGE) { if ! $(HAIKU_LIBSOLV_URL) {
Echo "No optional package LibSolv available for $(TARGET_ARCH)" ; Echo "No optional package LibSolv available for $(TARGET_ARCH)" ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
$(hpkgBaseURL)/$(HAIKU_LIBSOLV_PACKAGE) $(HAIKU_LIBSOLV_URL)
: system ; : system ;
} }
} }
src/kits/package/solver/Jamfile
+8 -4
View File
@@ -2,8 +2,10 @@ SubDir HAIKU_TOP src kits package solver ;
# add-on implementing a libsolv based BSolver # add-on implementing a libsolv based BSolver
SubDirSysHdrs $(HAIKU_LIBSOLV_HEADERS) ; UseBuildFeatureHeaders libsolv ;
SubDirHdrs $(HAIKU_LIBSOLV_HEADERS)/solv ;
local libsolvHeaders = [ BuildFeatureAttribute libsolv : headers : path ] ;
UseHeaders [ FDirName $(libsolvHeaders) solv ] ;
UsePrivateHeaders shared ; UsePrivateHeaders shared ;
@@ -12,9 +14,11 @@ SharedLibrary libpackage-add-on-libsolv.so
: :
LibsolvSolver.cpp LibsolvSolver.cpp
: :
package $(HAIKU_LIBSOLV_LIBS) be $(TARGET_LIBSTDC++) package
[ BuildFeatureAttribute libsolv : libraries ]
be $(TARGET_LIBSTDC++)
; ;
Includes [ FGristFiles LibsolvSolver.cpp ] Includes [ FGristFiles LibsolvSolver.cpp ]
: $(HAIKU_LIBSOLV_HEADERS_DEPENDENCY) ; : [ BuildFeatureAttribute libsolv : headers ] ;