modules: patch meson subprojects to use local dependencies

Usually we want no difference between the upstream project that we fork
via git-subtree, and our copy. However, for the subprojects, we need to
patch them. Do it.

If you know a better way, that allows to overwriting the subprojects
please send a patch.

14 files changed, 10 insertions, 8 deletions

diff --git a/src/c-rbtree/subprojects/libcstdaux-1 b/src/c-rbtree/subprojects/libcstdaux-1
new file mode 120000
index 0000000000..589984f3ad
--- /dev/null
+++ b/src/c-rbtree/subprojects/libcstdaux-1
@@ -0,0 +1 @@
+../../c-stdaux
\ No newline at end of file
diff --git a/src/c-rbtree/subprojects/libcstdaux-1.wrap b/src/c-rbtree/subprojects/libcstdaux-1.wrap
deleted file mode 100644
index 036020aafe..0000000000
--- a/src/c-rbtree/subprojects/libcstdaux-1.wrap
+++ /dev/null
@@ -1,3 +0,0 @@
-[wrap-git]
-url = https://github.com/c-util/c-stdaux.git
-revision = v1
diff --git a/src/c-siphash/subprojects/libcstdaux-1 b/src/c-siphash/subprojects/libcstdaux-1
new file mode 120000
index 0000000000..589984f3ad
--- /dev/null
+++ b/src/c-siphash/subprojects/libcstdaux-1
@@ -0,0 +1 @@
+../../c-stdaux
\ No newline at end of file
diff --git a/src/c-siphash/subprojects/libcstdaux-1.wrap b/src/c-siphash/subprojects/libcstdaux-1.wrap
deleted file mode 100644
index 036020aafe..0000000000
--- a/src/c-siphash/subprojects/libcstdaux-1.wrap
+++ /dev/null
@@ -1,3 +0,0 @@
-[wrap-git]
-url = https://github.com/c-util/c-stdaux.git
-revision = v1
diff --git a/src/n-acd/meson.build b/src/n-acd/meson.build
index 017dec5669..6479eb1a77 100644
--- a/src/n-acd/meson.build
+++ b/src/n-acd/meson.build
@@ -15,7 +15,7 @@ mod_pkgconfig = import('pkgconfig')
 sub_clist = subproject('c-list')
 sub_crbtree = subproject('c-rbtree')
 sub_csiphash = subproject('c-siphash')
-sub_cstdaux = subproject('c-stdaux')
+sub_cstdaux = subproject('libcstdaux-1')
 
 dep_clist = sub_clist.get_variable('libclist_dep')
 dep_crbtree = sub_crbtree.get_variable('libcrbtree_dep')
diff --git a/src/n-acd/subprojects/c-list b/src/n-acd/subprojects/c-list
-Subproject 6c53ef1c0066a3b0d82e9e181e90114eacb7c4a
diff --git a/src/n-acd/subprojects/c-rbtree b/src/n-acd/subprojects/c-rbtree
-Subproject c8cf175278452686cc5993e154d472d0a64d7fa
diff --git a/src/n-acd/subprojects/c-siphash b/src/n-acd/subprojects/c-siphash
-Subproject 2d159c7da1d542f2b1fcbbefea6931bce242b94
diff --git a/src/n-acd/subprojects/c-stdaux b/src/n-acd/subprojects/c-stdaux
deleted file mode 160000
-Subproject 8b8f941c57a790c277f49b099e73ed9f8ea141a
diff --git a/src/n-acd/subprojects/libcstdaux-1 b/src/n-acd/subprojects/libcstdaux-1
new file mode 120000
index 0000000000..589984f3ad
--- /dev/null
+++ b/src/n-acd/subprojects/libcstdaux-1
@@ -0,0 +1 @@
+../../c-stdaux
\ No newline at end of file
diff --git a/src/n-dhcp4/meson.build b/src/n-dhcp4/meson.build
index 1dddfe4f0d..8cdcb36865 100644
--- a/src/n-dhcp4/meson.build
+++ b/src/n-dhcp4/meson.build
@@ -14,7 +14,7 @@ mod_pkgconfig = import('pkgconfig')
 
 sub_clist = subproject('c-list')
 sub_csiphash = subproject('c-siphash')
-sub_cstdaux = subproject('c-stdaux')
+sub_cstdaux = subproject('libcstdaux-1')
 
 dep_clist = sub_clist.get_variable('libclist_dep')
 dep_csiphash = sub_csiphash.get_variable('libcsiphash_dep')
diff --git a/src/n-dhcp4/subprojects/c-list b/src/n-dhcp4/subprojects/c-list
-Subproject 6c53ef1c0066a3b0d82e9e181e90114eacb7c4a
diff --git a/src/n-dhcp4/subprojects/c-siphash b/src/n-dhcp4/subprojects/c-siphash
-Subproject 2d159c7da1d542f2b1fcbbefea6931bce242b94
diff --git a/src/n-dhcp4/subprojects/c-stdaux b/src/n-dhcp4/subprojects/c-stdaux
deleted file mode 160000
-Subproject 8b8f941c57a790c277f49b099e73ed9f8ea141a