summaryrefslogtreecommitdiffstats
path: root/yang/libyang_plugins
diff options
context:
space:
mode:
authorRenato Westphal <renato@opensourcerouting.org>2019-05-06 20:57:02 +0200
committerRenato Westphal <renato@opensourcerouting.org>2019-05-07 03:07:18 +0200
commit1b8de275c84f2bd079666364d899c243274dbf50 (patch)
treeb45075413b344b4f58c41daff1053a39c5dd0a57 /yang/libyang_plugins
parentMerge pull request #4256 from donaldsharp/zebra_table (diff)
downloadfrr-1b8de275c84f2bd079666364d899c243274dbf50.tar.xz
frr-1b8de275c84f2bd079666364d899c243274dbf50.zip
lib, yang: disable libyang custom user types temporarily
libyang 1.0 introduced a few changes in the user types API, and these changes made FRR incompatible with libyang 1.x. In order to ease our migration from libyang 0.x to libyang 1.x, let's disable our libyang custom user types temporarily so that FRR can work with both libyang 0.x and libyang 1.x. This should be especially helpful to the CI systems during the transition. Once the migration to libyang 1.x is complete, this commit will be reverted. Disabling our libyang custom user types should have only minimal performance implications when processing configuration transactions. The user types infrastructure should be more important in the future to perform canonization of YANG data values when necessary. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'yang/libyang_plugins')
-rw-r--r--yang/libyang_plugins/subdir.am13
1 files changed, 3 insertions, 10 deletions
diff --git a/yang/libyang_plugins/subdir.am b/yang/libyang_plugins/subdir.am
index fe5f34a28..837908a1b 100644
--- a/yang/libyang_plugins/subdir.am
+++ b/yang/libyang_plugins/subdir.am
@@ -2,13 +2,6 @@
# libyang user types
#
-if LIBYANG_EXT_BUILTIN
-lib_libfrr_la_SOURCES += yang/libyang_plugins/frr_user_types.c
-else
-libyang_plugins_LTLIBRARIES += yang/libyang_plugins/frr_user_types.la
-endif
-
-yang_libyang_plugins_frr_user_types_la_CFLAGS = $(WERROR) $(LIBYANG_CFLAGS)
-yang_libyang_plugins_frr_user_types_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
-yang_libyang_plugins_frr_user_types_la_LIBADD =
-yang_libyang_plugins_frr_user_types_la_SOURCES = yang/libyang_plugins/frr_user_types.c
+# XXX: disable support for libyang custom user types temporarily to facilitate
+# the transition from libyang 0.x to libyang 1.x.
+#lib_libfrr_la_SOURCES += yang/libyang_plugins/frr_user_types.c