From c13df3e4dc979f7ea07a2a0212a79a07ab0dbfa9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 19 Jul 2022 10:37:08 +0200 Subject: [PATCH] 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. --- src/c-rbtree/subprojects/libcstdaux-1 | 1 + src/c-rbtree/subprojects/libcstdaux-1.wrap | 3 --- src/c-siphash/subprojects/libcstdaux-1 | 1 + src/c-siphash/subprojects/libcstdaux-1.wrap | 3 --- src/n-acd/meson.build | 2 +- src/n-acd/subprojects/c-list | 2 +- src/n-acd/subprojects/c-rbtree | 2 +- src/n-acd/subprojects/c-siphash | 2 +- src/n-acd/subprojects/c-stdaux | 1 - src/n-acd/subprojects/libcstdaux-1 | 1 + src/n-dhcp4/meson.build | 2 +- src/n-dhcp4/subprojects/c-list | 2 +- src/n-dhcp4/subprojects/c-siphash | 2 +- src/n-dhcp4/subprojects/c-stdaux | 1 - 14 files changed, 10 insertions(+), 15 deletions(-) create mode 120000 src/c-rbtree/subprojects/libcstdaux-1 delete mode 100644 src/c-rbtree/subprojects/libcstdaux-1.wrap create mode 120000 src/c-siphash/subprojects/libcstdaux-1 delete mode 100644 src/c-siphash/subprojects/libcstdaux-1.wrap mode change 160000 => 120000 src/n-acd/subprojects/c-list mode change 160000 => 120000 src/n-acd/subprojects/c-rbtree mode change 160000 => 120000 src/n-acd/subprojects/c-siphash delete mode 160000 src/n-acd/subprojects/c-stdaux create mode 120000 src/n-acd/subprojects/libcstdaux-1 mode change 160000 => 120000 src/n-dhcp4/subprojects/c-list mode change 160000 => 120000 src/n-dhcp4/subprojects/c-siphash delete mode 160000 src/n-dhcp4/subprojects/c-stdaux diff --git a/src/c-rbtree/subprojects/libcstdaux-1 b/src/c-rbtree/subprojects/libcstdaux-1 new file mode 120000 index 000000000..589984f3a --- /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 036020aaf..000000000 --- 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 000000000..589984f3a --- /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 036020aaf..000000000 --- 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 017dec566..6479eb1a7 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 deleted file mode 160000 index 6c53ef1c0..000000000 --- a/src/n-acd/subprojects/c-list +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6c53ef1c0066a3b0d82e9e181e90114eacb7c4aa diff --git a/src/n-acd/subprojects/c-list b/src/n-acd/subprojects/c-list new file mode 120000 index 000000000..4e274698d --- /dev/null +++ b/src/n-acd/subprojects/c-list @@ -0,0 +1 @@ +../../c-list \ No newline at end of file diff --git a/src/n-acd/subprojects/c-rbtree b/src/n-acd/subprojects/c-rbtree deleted file mode 160000 index c8cf17527..000000000 --- a/src/n-acd/subprojects/c-rbtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c8cf175278452686cc5993e154d472d0a64d7fac diff --git a/src/n-acd/subprojects/c-rbtree b/src/n-acd/subprojects/c-rbtree new file mode 120000 index 000000000..49264a87b --- /dev/null +++ b/src/n-acd/subprojects/c-rbtree @@ -0,0 +1 @@ +../../c-rbtree \ No newline at end of file diff --git a/src/n-acd/subprojects/c-siphash b/src/n-acd/subprojects/c-siphash deleted file mode 160000 index 2d159c7da..000000000 --- a/src/n-acd/subprojects/c-siphash +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2d159c7da1d542f2b1fcbbefea6931bce242b943 diff --git a/src/n-acd/subprojects/c-siphash b/src/n-acd/subprojects/c-siphash new file mode 120000 index 000000000..70d68818c --- /dev/null +++ b/src/n-acd/subprojects/c-siphash @@ -0,0 +1 @@ +../../c-siphash \ No newline at end of file diff --git a/src/n-acd/subprojects/c-stdaux b/src/n-acd/subprojects/c-stdaux deleted file mode 160000 index 8b8f941c5..000000000 --- a/src/n-acd/subprojects/c-stdaux +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8b8f941c57a790c277f49b099e73ed9f8ea141af diff --git a/src/n-acd/subprojects/libcstdaux-1 b/src/n-acd/subprojects/libcstdaux-1 new file mode 120000 index 000000000..589984f3a --- /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 1dddfe4f0..8cdcb3686 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 deleted file mode 160000 index 6c53ef1c0..000000000 --- a/src/n-dhcp4/subprojects/c-list +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6c53ef1c0066a3b0d82e9e181e90114eacb7c4aa diff --git a/src/n-dhcp4/subprojects/c-list b/src/n-dhcp4/subprojects/c-list new file mode 120000 index 000000000..4e274698d --- /dev/null +++ b/src/n-dhcp4/subprojects/c-list @@ -0,0 +1 @@ +../../c-list \ No newline at end of file diff --git a/src/n-dhcp4/subprojects/c-siphash b/src/n-dhcp4/subprojects/c-siphash deleted file mode 160000 index 2d159c7da..000000000 --- a/src/n-dhcp4/subprojects/c-siphash +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2d159c7da1d542f2b1fcbbefea6931bce242b943 diff --git a/src/n-dhcp4/subprojects/c-siphash b/src/n-dhcp4/subprojects/c-siphash new file mode 120000 index 000000000..70d68818c --- /dev/null +++ b/src/n-dhcp4/subprojects/c-siphash @@ -0,0 +1 @@ +../../c-siphash \ No newline at end of file diff --git a/src/n-dhcp4/subprojects/c-stdaux b/src/n-dhcp4/subprojects/c-stdaux deleted file mode 160000 index 8b8f941c5..000000000 --- a/src/n-dhcp4/subprojects/c-stdaux +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8b8f941c57a790c277f49b099e73ed9f8ea141af