Date: Mon, 16 Dec 2019 22:05:05 +0000 (UTC) From: Phil Shafer <phil@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r355826 - head/lib/libxo head/lib/libxo/encoder/csv head/lib/libxo/libxo head/lib/libxo/tests head/lib/libxo/tests/encoder head/usr.bin/xo vendor/Juniper/libxo Message-ID: <201912162205.xBGM55fw014657@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: phil Date: Mon Dec 16 22:05:03 2019 New Revision: 355826 URL: https://svnweb.freebsd.org/changeset/base/355826 Log: Allow proper builds of libxo's CSV encoder: - Move libxo.a build to subdirectory (lib/libxo/libxo/Makefile) - Add .WAIT target to delay encoder build til after libxo - Use FILES to install encoder library as csv.enc - Update import script to put xo_config.h in new location Modified: vendor/Juniper/libxo/.svnignore vendor/Juniper/libxo/import.sh Directory Properties: vendor/Juniper/libxo/ (props changed) Changes in other areas also in this revision: Added: head/lib/libxo/libxo/ head/lib/libxo/libxo/Makefile (contents, props changed) head/lib/libxo/libxo/xo_config.h - copied unchanged from r355672, head/lib/libxo/xo_config.h Deleted: head/lib/libxo/xo_config.h Modified: head/lib/libxo/Makefile head/lib/libxo/encoder/csv/Makefile head/lib/libxo/tests/Makefile head/lib/libxo/tests/encoder/Makefile head/usr.bin/xo/Makefile Modified: vendor/Juniper/libxo/.svnignore ============================================================================== --- vendor/Juniper/libxo/.svnignore Mon Dec 16 21:52:12 2019 (r355825) +++ vendor/Juniper/libxo/.svnignore Mon Dec 16 22:05:03 2019 (r355826) @@ -1,6 +1,6 @@ -libxo-0.4.6 -libxo-0.4.7 -libxo-0.6.0 -libxo-0.6.1 -libxo-0.6.2 +libxo-1.0.2 +libxo-1.0.4 +libxo-1.1.0 +libxo-1.3.0 +libxo-1.3.1 tag.sh Modified: vendor/Juniper/libxo/import.sh ============================================================================== --- vendor/Juniper/libxo/import.sh Mon Dec 16 21:52:12 2019 (r355825) +++ vendor/Juniper/libxo/import.sh Mon Dec 16 22:05:03 2019 (r355826) @@ -290,7 +290,7 @@ run "build for real" \ # Move over and build the source tree Cd $HEAD -run "copying xo_config.h" "(echo '/* \$FreeBSD\$ */' ; cat $CWD/dist/build/libxo/xo_config.h ) > $HEAD/lib/libxo/xo_config.h" +run "copying xo_config.h" "(echo '/* \$FreeBSD\$ */' ; cat $CWD/dist/build/libxo/xo_config.h ) > $HEAD/lib/libxo/libxo/xo_config.h" run "copying add.man" "(echo '.\\\" \$FreeBSD\$' ; cat $CWD/dist/build/libxo/add.man ) > $HEAD/lib/libxo/add.man" run "copying xohtml.sh" "(echo '#!/bin/sh' ; echo '# \$FreeBSD\$' ; cat $CWD/dist/build/xohtml/xohtml.sh ) > $HEAD/usr.bin/xohtml/xohtml.sh"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912162205.xBGM55fw014657>