Welcome to little lamb

Code » comain » commit 942b6a7

meta/deps.tpl: Update skalibs

author Olivier Brunel
2023-07-18 07:17:50 UTC
committer Olivier Brunel
2023-07-18 07:18:29 UTC
parent 9731de7d611adc43f6ab35681a921fd1febf88f4

meta/deps.tpl: Update skalibs

meta/deps.tpl/skalibs/after/limb +0 -0
meta/deps.tpl/skalibs/get_incdir +5 -0
meta/deps.tpl/skalibs/get_libs +2 -0
meta/deps.tpl/skalibs/get_version +12 -1
meta/deps.tpl/skalibs/git +1 -1
meta/deps.tpl/skalibs/incdir +0 -1
meta/deps.tpl/skalibs/include +0 -0
meta/deps.tpl/skalibs/libdir +0 -1
meta/deps.tpl/skalibs/ref +1 -0
meta/deps.tpl/skalibs/version +1 -1

diff --git a/meta/deps.tpl/skalibs/after/limb b/meta/deps.tpl/skalibs/after/limb
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/deps.tpl/skalibs/get_incdir b/meta/deps.tpl/skalibs/get_incdir
new file mode 100755
index 0000000..70d97d5
--- /dev/null
+++ b/meta/deps.tpl/skalibs/get_incdir
@@ -0,0 +1,5 @@
+#!/bin/sh
+isint=$1
+if test $isint -eq 1; then
+    echo src/include
+fi
diff --git a/meta/deps.tpl/skalibs/get_libs b/meta/deps.tpl/skalibs/get_libs
new file mode 100755
index 0000000..2ef5644
--- /dev/null
+++ b/meta/deps.tpl/skalibs/get_libs
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo -lskarnet
diff --git a/meta/deps.tpl/skalibs/get_version b/meta/deps.tpl/skalibs/get_version
index 55041f5..3bc6399 100755
--- a/meta/deps.tpl/skalibs/get_version
+++ b/meta/deps.tpl/skalibs/get_version
@@ -1,2 +1,13 @@
 #!/bin/sh
-grep SKALIBS_VERSION "$@/skalibs/config.h" | cut -d\" -f2
+isint=$1
+intdir=$2
+libdir=$3
+incdir=$4
+
+if test $isint -eq 1; then
+    d="$intdir/src/include"
+else
+    d="$incdir"
+fi
+
+grep SKALIBS_VERSION "$d/skalibs/config.h" | cut -d\" -f2
diff --git a/meta/deps.tpl/skalibs/git b/meta/deps.tpl/skalibs/git
index 5965139..1d48368 100644
--- a/meta/deps.tpl/skalibs/git
+++ b/meta/deps.tpl/skalibs/git
@@ -1 +1 @@
-git://lila.oss/skalibs.git
+git://git.skarnet.org/skalibs
diff --git a/meta/deps.tpl/skalibs/incdir b/meta/deps.tpl/skalibs/incdir
deleted file mode 100644
index e4484e2..0000000
--- a/meta/deps.tpl/skalibs/incdir
+++ /dev/null
@@ -1 +0,0 @@
-src/include
diff --git a/meta/deps.tpl/skalibs/include b/meta/deps.tpl/skalibs/include
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/deps.tpl/skalibs/libdir b/meta/deps.tpl/skalibs/libdir
deleted file mode 100644
index 5baacc7..0000000
--- a/meta/deps.tpl/skalibs/libdir
+++ /dev/null
@@ -1 +0,0 @@
-skalibs
diff --git a/meta/deps.tpl/skalibs/ref b/meta/deps.tpl/skalibs/ref
new file mode 100644
index 0000000..65a4d13
--- /dev/null
+++ b/meta/deps.tpl/skalibs/ref
@@ -0,0 +1 @@
+v2.13.1.1
diff --git a/meta/deps.tpl/skalibs/version b/meta/deps.tpl/skalibs/version
index 48c7359..739323d 100644
--- a/meta/deps.tpl/skalibs/version
+++ b/meta/deps.tpl/skalibs/version
@@ -1 +1 @@
-2.13.0.0
+2.13.1.1