[haiku-commits] BRANCH HaikuPM-github.package-management [01293f6] build/jam
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 18 Jun 2013 11:45:33 +0200 (CEST)
added 3 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: e31d588184b83bb5cc7a1a527b5ef35c5af8a78f
new head: 01293f6a5dcb826918cf4f13e71c3ac9801ff46e
overview: https://github.com/haiku/HaikuPM/compare/e31d588...01293f6
----------------------------------------------------------------------------
7f453e3: Update packages vision, wpa_supplicant, wqy_microhei, yasm
56c3ef1: Disable xz-utils optional package for gcc 2
01293f6: OptionalPackages: fix syntax errors
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
1 file changed, 20 insertions(+), 20 deletions(-)
build/jam/OptionalPackages | 40 ++++++++++++++++++++--------------------
############################################################################
Commit: 7f453e3b5f7dbfa8b056507086c3983ed5bba8b1
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Tue Jun 18 09:29:00 2013 UTC
Update packages vision, wpa_supplicant, wqy_microhei, yasm
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 3e85027..b677d08 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -2014,7 +2014,7 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
$(baseURL)/vision-908-r1a4-x86-gcc4-2012-09-04.zip ;
} else {
InstallOptionalHaikuImagePackage
- $(hpkgBaseURL)/vision-908-3-x86_gcc2.hpkg ;
+
$(hpkgBaseURL)/vision-0.9.7.r944-1-x86_gcc2.hpkg ;
}
AddSymlinkToHaikuImage home config settings deskbar menu
Applications
: /boot/common/apps/Vision/Vision ;
@@ -2148,7 +2148,7 @@ if [ IsOptionalHaikuImagePackageAdded wpa_supplicant ] {
: : !stripDebugSymbols ;
} else {
InstallOptionalHaikuImagePackage
- $(hpkgBaseURL)/wpa_supplicant-0.7.3-2-x86_gcc2.hpkg
+ $(hpkgBaseURL)/wpa_supplicant-2.0-3-x86_gcc2.hpkg
: system ;
}
}
@@ -2157,7 +2157,7 @@ if [ IsOptionalHaikuImagePackageAdded wpa_supplicant ] {
# WQY-MicroHei
if [ IsOptionalHaikuImagePackageAdded WQY-MicroHei ] {
InstallOptionalHaikuImagePackage
- $(hpkgBaseURL)/wqy_microhei-0.2.0~beta-2-any.hpkg ;
+ $(hpkgBaseURL)/wqy_microhei-0.2.0~beta-3-any.hpkg ;
}
@@ -2202,7 +2202,7 @@ if [ IsOptionalHaikuImagePackageAdded Yasm ] {
$(baseURL)/yasm-1.2.0-r1a4-x86-gcc4-2012-08-29.zip ;
} else {
InstallOptionalHaikuImagePackage
- $(hpkgBaseURL)/yasm-1.2.0-2-x86_gcc2.hpkg ;
+ $(hpkgBaseURL)/yasm-1.2.0-3-x86_gcc2.hpkg ;
}
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
############################################################################
Commit: 56c3ef1d732569b59024d6f326c8c1c4ff803b7d
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Tue Jun 18 09:32:23 2013 UTC
Disable xz-utils optional package for gcc 2
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index b677d08..de4ff6f 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -2171,22 +2171,22 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
InstallOptionalHaikuImagePackage
$(baseURL)/xz-utils-5.0.4-x86-gcc4-2013-02-16.zip ;
} else {
- # TODO: Remove! It's actually the repackaged gcc 4
archive.
- InstallOptionalHaikuImagePackage
- $(hpkgBaseURL)/xz-utils-5.0.1-2-x86_gcc2.hpkg ;
+ Echo "No optional package XZ-Utils available for gcc"
+ $(HAIKU_GCC_VERSION[1]) ;
}
- AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
- : "tar -Jtvf \\0045s"
- : "tar -Jxvf \\0045s"
- ;
- AddExpanderRuleToHaikuImage "application/x-xz" : .txz
- : "tar -Jtvf \\0045s"
- : "tar -Jxvf \\0045s"
- ;
- AddExpanderRuleToHaikuImage "application/x-xz" : .xz
- : "echo \\0045s | sed 's/.xz\\\$//g'"
- : "xz -df \\0045s"
+# TODO: Move rules into package!
+# AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
+# : "tar -Jtvf \\0045s"
+# : "tar -Jxvf \\0045s"
+# ;
+# AddExpanderRuleToHaikuImage "application/x-xz" : .txz
+# : "tar -Jtvf \\0045s"
+# : "tar -Jxvf \\0045s"
+# ;
+# AddExpanderRuleToHaikuImage "application/x-xz" : .xz
+# : "echo \\0045s | sed 's/.xz\\\$//g'"
+# : "xz -df \\0045s"
;
} else {
Echo "No optional package XZ-Utils available for
$(TARGET_ARCH)" ;
############################################################################
Commit: 01293f6a5dcb826918cf4f13e71c3ac9801ff46e
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Tue Jun 18 09:40:12 2013 UTC
OptionalPackages: fix syntax errors
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index de4ff6f..b7db20b 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1740,7 +1740,7 @@ if [ IsOptionalHaikuImagePackageAdded Readline ] {
Echo "No optional package Readline available for gcc 4"
;
} else {
InstallOptionalHaikuImagePackage
- $(hpkgBaseURL)/readline-6.2-3-x86_gcc2.hpkg;
+ $(hpkgBaseURL)/readline-6.2-3-x86_gcc2.hpkg ;
}
}
}
@@ -2187,7 +2187,7 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
# AddExpanderRuleToHaikuImage "application/x-xz" : .xz
# : "echo \\0045s | sed 's/.xz\\\$//g'"
# : "xz -df \\0045s"
- ;
+# ;
} else {
Echo "No optional package XZ-Utils available for
$(TARGET_ARCH)" ;
}
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management [01293f6] build/jam - HaikuPM-github . package-management
