proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-28 11:50:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: carry --with-pkg-extra-version into tarballs

Browse Source 
If we use "./configure --with-pkg-extra-version=... && make dist", we
probably want the dist tarball to remember the extra version it was
configured with.

Use --without-pkg-extra-version to kill the tag.

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2018-10-23 14:06:25 +02:00
parent 0558dc67a3
commit 06871ed9fb
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,6 +7,7 @@
/config.status /config.status
/config.guess /config.guess
/config.sub /config.sub
/config.version
/ltmain.sh /ltmain.sh
/stamp-h /stamp-h
/stamp-h[0-9]* /stamp-h[0-9]*

1
Makefile.am
View File

@ -161,6 +161,7 @@ EXTRA_DIST += \
README.md \ README.md \
m4/README.txt \ m4/README.txt \
m4/libtool-whole-archive.patch \ m4/libtool-whole-archive.patch \
config.version \
\ \
python/clidef.py \ python/clidef.py \
python/clippy/__init__.py \ python/clippy/__init__.py \

4
config.version.in Normal file
View File

@ -0,0 +1,4 @@
# this file is used to carry --with-pkg-extra-version into tarballs
EXTRAVERSION="@EXTRAVERSION@"
# for easy access by scripts before ./configure is run
DIST_PACKAGE_VERSION="@PACKAGE_VERSION@"

16
configure.ac
View File

@ -352,9 +352,19 @@ test -f conftest.a && rm conftest.a
dnl ---------------------- dnl ----------------------
dnl Packages configuration dnl Packages configuration
dnl ---------------------- dnl ----------------------
if test -f config.version; then
. ./config.version
elif test -f "${srcdir}/config.version"; then
. "${srcdir}/config.version"
fi
AC_ARG_WITH(pkg-extra-version, AC_ARG_WITH(pkg-extra-version,
AS_HELP_STRING([--with-pkg-extra-version=VER], [add extra version field, for packagers/distributions]), AS_HELP_STRING([--with-pkg-extra-version=VER], [add extra version field, for packagers/distributions]), [
[EXTRAVERSION=$withval],) if test "$withval" = "no"; then
EXTRAVERSION=
else
EXTRAVERSION=$withval
fi
], [])
AC_ARG_WITH(pkg-git-version, AC_ARG_WITH(pkg-git-version,
AS_HELP_STRING([--with-pkg-git-version], [add git information to MOTD and build version string]), AS_HELP_STRING([--with-pkg-git-version], [add git information to MOTD and build version string]),
[ test "x$withval" != "xno" && with_pkg_git_version="yes" ]) [ test "x$withval" != "xno" && with_pkg_git_version="yes" ])
@ -768,6 +778,7 @@ if test "x${EXTRAVERSION}" != "x" ; then
AC_SUBST(PACKAGE_EXTRAVERSION, ["${EXTRAVERSION}"]) AC_SUBST(PACKAGE_EXTRAVERSION, ["${EXTRAVERSION}"])
PACKAGE_STRING="${PACKAGE_STRING}${EXTRAVERSION}" PACKAGE_STRING="${PACKAGE_STRING}${EXTRAVERSION}"
fi fi
AC_SUBST(EXTRAVERSION)
if test "x$with_pkg_git_version" = "xyes"; then if test "x$with_pkg_git_version" = "xyes"; then
if test -d "${srcdir}/.git"; then if test -d "${srcdir}/.git"; then
@ -2059,6 +2070,7 @@ AC_MSG_RESULT($ac_cv_htonl_works)
AC_CONFIG_FILES([Makefile],[sed -e 's/^#AUTODERP# //' -i Makefile]) AC_CONFIG_FILES([Makefile],[sed -e 's/^#AUTODERP# //' -i Makefile])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
config.version
redhat/frr.spec redhat/frr.spec
solaris/Makefile solaris/Makefile
debianpkg/changelog debianpkg/changelog