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

Update cmake and libsolv packages

Browse Source
This commit is contained in:
Ingo Weinhold
2013-04-28 19:21:46 +02:00
parent 212cb7333a
commit 49da4a2d47
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+5 -5
View File
@@ -222,7 +222,7 @@ 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_04_18-1-x86_gcc2.hpkg ; = libsolv-0.3.0_haiku_2013_04_18-2-x86_gcc2.hpkg ;
} else { } else {
Echo "Libsolv not available for gcc4." ; Echo "Libsolv not available for gcc4." ;
} }
@@ -236,16 +236,16 @@ if $(HAIKU_LIBSOLV_PACKAGE) {
# extract headers and libraries # extract headers and libraries
HAIKU_LIBSOLV_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_LIBSOLV_DIR) HAIKU_LIBSOLV_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_LIBSOLV_DIR)
: include/ : $(HAIKU_LIBSOLV_PACKAGE_FILE) : extracted-libsolv : develop/headers/ : $(HAIKU_LIBSOLV_PACKAGE_FILE) : extracted-libsolv
] ; ] ;
HAIKU_LIBSOLV_LIBS = [ ExtractArchive $(HAIKU_LIBSOLV_DIR) HAIKU_LIBSOLV_LIBS = [ ExtractArchive $(HAIKU_LIBSOLV_DIR)
: :
lib/libsolv.so develop/lib/libsolv.so
lib/libsolvext.so develop/lib/libsolvext.so
: $(HAIKU_LIBSOLV_PACKAGE_FILE) : $(HAIKU_LIBSOLV_PACKAGE_FILE)
: extracted-libsolv : extracted-libsolv
] ; ] ;
HAIKU_LIBSOLV_HEADERS = [ FDirName $(HAIKU_LIBSOLV_DIR) include ] ; HAIKU_LIBSOLV_HEADERS = [ FDirName $(HAIKU_LIBSOLV_DIR) develop/headers ] ;
} }
build/jam/OptionalPackages
+1 -1
View File
@@ -410,7 +410,7 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] {
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
$(hpkgBaseURL)/cmake-2.8.5-2-gcc2_x86.hpkg $(hpkgBaseURL)/cmake-2.8.5-3-x86_gcc2.hpkg
: common packages ; : common packages ;
} }
} }