-
Notifications
You must be signed in to change notification settings - Fork 1.3k
build: preliminary pkgconf .pc file (WIP) #18881
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,6 +31,9 @@ | |
/test-driver | ||
/test-suite.log | ||
|
||
/frr.pc | ||
/frr-uninstalled.pc | ||
|
||
/Makefile | ||
/Makefile.in | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -668,6 +668,7 @@ fi | |
AC_SUBST([AC_LDFLAGS]) | ||
AC_SUBST([AC_LDFLAGS_EXEC]) | ||
AM_CONDITIONAL([STATIC_BIN], [test "$enable_static_bin" = "yes"]) | ||
AC_SUBST([LT_OBJDIR], [$lt_cv_objdir]) | ||
|
||
dnl libtool, the repository of all knowledge related linkers, is too stupid to | ||
dnl correctly tell the linker how to build modules. | ||
|
@@ -1065,6 +1066,7 @@ case "${enable_multipath}" in | |
esac | ||
|
||
AC_DEFINE_UNQUOTED([MULTIPATH_NUM], [$MPATH_NUM], [Maximum number of paths for a route]) | ||
AC_SUBST([MULTIPATH_NUM], [$MPATH_NUM]) | ||
|
||
case "${with_log_timestamp_precision}" in | ||
[[0-9]|1[012]]) | ||
|
@@ -2828,6 +2830,8 @@ AC_CONFIG_FILES([tools/frrinit.sh], [chmod +x tools/frrinit.sh]) | |
AC_CONFIG_FILES([tools/frrcommon.sh]) | ||
AC_CONFIG_FILES([tools/frr.service]) | ||
AC_CONFIG_FILES([tools/[email protected]]) | ||
AC_CONFIG_FILES([frr.pc]) | ||
AC_CONFIG_FILES([frr-uninstalled.pc]) | ||
|
||
# dnl write out a ccls file with our compile configuration | ||
# dnl have to add -Wno-unused-function otherwise foobar_cmd_magic causes | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# 'root of all evil' path references | ||
# | ||
abs_top_srcdir="@abs_top_srcdir@" | ||
abs_top_builddir="@abs_top_builddir@" | ||
# | ||
# the following are provided so you can line up installation paths. | ||
# note you can access them with e.g. "pkgconf --variable=moduledir" | ||
# | ||
frr_runstatedir="@e_frr_runstatedir@" | ||
frr_libstatedir="@e_frr_libstatedir@" | ||
yangmodelsdir="@e_yangmodelsdir@" | ||
moduledir="@e_moduledir@" | ||
scriptdir="@e_scriptdir@" | ||
frr_sysconfdir="@e_frr_sysconfdir@/" | ||
vtysh_bin="@e_vtysh_bin@" | ||
watchfrr_sh="@e_watchfrr_sh@" | ||
# | ||
# these are needed to make the build work | ||
# | ||
multipath_num="@MULTIPATH_NUM@" | ||
libdir="@libdir@" | ||
# FIXME: this is a relative path | ||
clippy="@CLIPPY@" | ||
|
||
Name: @PACKAGE@ | ||
Description: FRRouting non-installed build support | ||
URL: @PACKAGE_BUGREPORT@ | ||
Version: @PACKAGE_VERSION@ | ||
Libs: -L${libdir} -L${abs_top_builddir}/lib -L${abs_top_builddir}/lib/@LT_OBJDIR@ -Wl,-rpath,${libdir} -lfrr | ||
Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} -I${abs_top_srcdir}/lib -I${abs_top_builddir}/lib \ | ||
-fms-extensions -DMULTIPATH_NUM=${multipath_num} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# when packaging an FRR source/build tree, fill in the next line | ||
# (e.g. with /usr/src/frr) | ||
# | ||
abs_top_treedir="FILL_TREEDIR_DURING_PACKAGING" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This file should be installed by There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. autoconf doesn't have a "standard" path specifying command line option for |
||
# | ||
# the following are provided so you can line up installation paths. | ||
# note you can access them with e.g. "pkgconf --variable=moduledir" | ||
# | ||
frr_runstatedir="@e_frr_runstatedir@" | ||
frr_libstatedir="@e_frr_libstatedir@" | ||
yangmodelsdir="@e_yangmodelsdir@" | ||
moduledir="@e_moduledir@" | ||
scriptdir="@e_scriptdir@" | ||
frr_sysconfdir="@e_frr_sysconfdir@/" | ||
vtysh_bin="@e_vtysh_bin@" | ||
watchfrr_sh="@e_watchfrr_sh@" | ||
# | ||
# these are needed to make the build work | ||
# | ||
multipath_num="@MULTIPATH_NUM@" | ||
libdir="@libdir@" | ||
clippy="${abs_top_treedir}/lib/clippy" | ||
|
||
Name: @PACKAGE@ | ||
Description: FRRouting packaged-source-tree build support | ||
URL: @PACKAGE_BUGREPORT@ | ||
Version: @PACKAGE_VERSION@ | ||
Libs: -L${libdir} -Wl,-rpath,${libdir} -lfrr | ||
Cflags: -I${abs_top_treedir} -I${abs_top_treedir}/lib \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It is missing There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't be needed as long as you use |
||
-fms-extensions -DMULTIPATH_NUM=${multipath_num} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no point in installing the whole build tree. Only certain headers are required for compiling dplane plugins:
*.h
,lib/*.h
,zebra/*.h
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah this was just poorly worded, the intention is the header files. I was calling it
build
because the linux kernel thing is sometimes calledkbuild