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.
This commit is contained in:
Thomas Haller
2022-07-19 10:37:08 +02:00
parent 0f1cc3e954
commit c13df3e4dc
14 changed files with 10 additions and 15 deletions

View File

@@ -0,0 +1 @@
../../c-stdaux

View File

@@ -1,3 +0,0 @@
[wrap-git]
url = https://github.com/c-util/c-stdaux.git
revision = v1

View File

@@ -0,0 +1 @@
../../c-stdaux

View File

@@ -1,3 +0,0 @@
[wrap-git]
url = https://github.com/c-util/c-stdaux.git
revision = v1

View File

@@ -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')

Submodule src/n-acd/subprojects/c-list deleted from 6c53ef1c00

View File

@@ -0,0 +1 @@
../../c-list

Submodule src/n-acd/subprojects/c-rbtree deleted from c8cf175278

View File

@@ -0,0 +1 @@
../../c-rbtree

Submodule src/n-acd/subprojects/c-siphash deleted from 2d159c7da1

View File

@@ -0,0 +1 @@
../../c-siphash

Submodule src/n-acd/subprojects/c-stdaux deleted from 8b8f941c57

View File

@@ -0,0 +1 @@
../../c-stdaux

View File

@@ -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')

Submodule src/n-dhcp4/subprojects/c-list deleted from 6c53ef1c00

View File

@@ -0,0 +1 @@
../../c-list

Submodule src/n-dhcp4/subprojects/c-siphash deleted from 2d159c7da1

View File

@@ -0,0 +1 @@
../../c-siphash

Submodule src/n-dhcp4/subprojects/c-stdaux deleted from 8b8f941c57