diff options
author | Phil Shafer <phil@FreeBSD.org> | 2019-11-07 18:06:44 +0000 |
---|---|---|
committer | Phil Shafer <phil@FreeBSD.org> | 2019-11-07 18:06:44 +0000 |
commit | 67322d1642c186afaa55f77d04ba2cd0eee03adf (patch) | |
tree | ce5a295993c574239d847bbf7aa3ecbfaf8f5078 /lib/libxo | |
parent | 4ffa494e4ff30e63accf01a4f333941b59aad65a (diff) | |
parent | 5fe9672cf6a4e4e6c6bbdb133c9d998f577f88f2 (diff) | |
download | src-67322d1642c186afaa55f77d04ba2cd0eee03adf.tar.gz src-67322d1642c186afaa55f77d04ba2cd0eee03adf.zip |
Import libxo-1.3.1:
- handle argv[0] without '/'
- add test case for argv[0] without '/'
Notes
Notes:
svn path=/head/; revision=354455
Diffstat (limited to 'lib/libxo')
-rw-r--r-- | lib/libxo/add.man | 4 | ||||
-rw-r--r-- | lib/libxo/encoder/csv/Makefile | 3 | ||||
-rw-r--r-- | lib/libxo/xo_config.h | 12 |
3 files changed, 10 insertions, 9 deletions
diff --git a/lib/libxo/add.man b/lib/libxo/add.man index 85b635ca1539..b58af28c26b5 100644 --- a/lib/libxo/add.man +++ b/lib/libxo/add.man @@ -3,10 +3,10 @@ .Fx uses .Nm libxo -version 1.3.0. +version 1.3.1. Complete documentation can be found on github: .Bd -literal -offset indent -https://juniper.github.io/libxo/1.3.0/html/index.html +https://juniper.github.io/libxo/1.3.1/html/index.html .Ed .Pp .Nm libxo diff --git a/lib/libxo/encoder/csv/Makefile b/lib/libxo/encoder/csv/Makefile index bd5ce912fa05..594fd0efc871 100644 --- a/lib/libxo/encoder/csv/Makefile +++ b/lib/libxo/encoder/csv/Makefile @@ -2,7 +2,7 @@ LIBXODIR= ${STAGEDIR}${PREFIX}/usr/lib/libxo/encoder SHLIBDIR?= ${LIBXODIR} -LIBDIR?= ${LIBXODIR} +LIBDIR?= ${LIBXODIR} .include <src.opts.mk> @@ -21,6 +21,7 @@ CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR} CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\" LIBADD= util xo +LDFLAGS += -L${.OBJDIR}/../../wildebeast WARNS?= 5 diff --git a/lib/libxo/xo_config.h b/lib/libxo/xo_config.h index ed4cd0496940..857af5356c57 100644 --- a/lib/libxo/xo_config.h +++ b/lib/libxo/xo_config.h @@ -183,16 +183,16 @@ /* #undef LIBXO_TEXT_ONLY */ /* Version number as dotted value */ -#define LIBXO_VERSION "1.3.0" +#define LIBXO_VERSION "1.3.1" /* Version number extra information */ #define LIBXO_VERSION_EXTRA "" /* Version number as a number */ -#define LIBXO_VERSION_NUMBER 1003000 +#define LIBXO_VERSION_NUMBER 1003001 /* Version number as string */ -#define LIBXO_VERSION_STRING "1003000" +#define LIBXO_VERSION_STRING "1003001" /* Enable local wcwidth implementation */ #define LIBXO_WCWIDTH 1 @@ -210,7 +210,7 @@ #define PACKAGE_NAME "libxo" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libxo 1.3.0" +#define PACKAGE_STRING "libxo 1.3.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libxo" @@ -219,7 +219,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.3.0" +#define PACKAGE_VERSION "1.3.1" /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -236,7 +236,7 @@ /* #undef USE_INT_RETURN_CODES */ /* Version number of package */ -#define VERSION "1.3.0" +#define VERSION "1.3.1" /* Retain hash bucket size */ /* #undef XO_RETAIN_SIZE */ |