summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2011-03-10 12:33:58 -0800
committerGeorge Sherwood2011-03-12 09:55:39 -0600
commit712fd16267c8ef34978732bd610467ab81fceddf (patch)
tree1088911d78c18dcf1061a825ad8de273ee8743aa
parent19222215c6c224324eb1af3b7aa8ff388a4352c6 (diff)
vala: Allow forcing vapigen config
(cherry picked from commit ee54fa68ce92f44083d7f82e6ad4c66dca5ecbd2)
-rw-r--r--devel/vala/HISTORY3
-rwxr-xr-xdevel/vala/PRE_SUB_DEPENDS1
-rwxr-xr-xdevel/vala/REPAIR^2c5ac3fd0fa95e310bf07c5b91de7a63^PRE_SUB_DEPENDS5
-rwxr-xr-xdevel/vala/SUB_DEPENDS2
4 files changed, 11 insertions, 0 deletions
diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY
index 9b6c5cdb9c..ec6ed65e86 100644
--- a/devel/vala/HISTORY
+++ b/devel/vala/HISTORY
@@ -1,3 +1,6 @@
+2011-03-10 Eric Sandall <sandalle@sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing vapigen config
+
2011-01-23 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated stable to 0.10.3 and devel to 0.11.5. Added
devel version
diff --git a/devel/vala/PRE_SUB_DEPENDS b/devel/vala/PRE_SUB_DEPENDS
index 2465728884..cf3e4b756c 100755
--- a/devel/vala/PRE_SUB_DEPENDS
+++ b/devel/vala/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
DEVEL) if [[ "$VALA_DEVEL" == "y" ]]; then return 0; fi;;
+ VAPIGEN) if [[ "$VALA_VAPIGEN" == "--enable-vapigen" ]]; then return 0; fi;;
esac
return 1
diff --git a/devel/vala/REPAIR^2c5ac3fd0fa95e310bf07c5b91de7a63^PRE_SUB_DEPENDS b/devel/vala/REPAIR^2c5ac3fd0fa95e310bf07c5b91de7a63^PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..cf3e4b756c
--- /dev/null
+++ b/devel/vala/REPAIR^2c5ac3fd0fa95e310bf07c5b91de7a63^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ DEVEL) if [[ "$VALA_DEVEL" == "y" ]]; then return 0; fi;;
+ VAPIGEN) if [[ "$VALA_VAPIGEN" == "--enable-vapigen" ]]; then return 0; fi;;
+esac
+return 1
diff --git a/devel/vala/SUB_DEPENDS b/devel/vala/SUB_DEPENDS
index e9c73b4cad..f295b42271 100755
--- a/devel/vala/SUB_DEPENDS
+++ b/devel/vala/SUB_DEPENDS
@@ -1,5 +1,7 @@
case $THIS_SUB_DEPENDS in
DEVEL) echo "Devel release needed, forcing it." &&
VALA_DEVEL="y" ;;
+ VAPIGEN) echo "Requiring vapigen, forcing it." &&
+ VALA_VAPIGEN="--enable-vapigen" ;;
*) echo "unknown sub-depends!"; return 1 ;;
esac