From owner-svn-src-all@freebsd.org Mon Dec 16 22:05:05 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D1D051CFDBE; Mon, 16 Dec 2019 22:05:05 +0000 (UTC) (envelope-from phil@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47cFgj4Cq4z4NWb; Mon, 16 Dec 2019 22:05:05 +0000 (UTC) (envelope-from phil@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C2133FA0; Mon, 16 Dec 2019 22:05:05 +0000 (UTC) (envelope-from phil@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBGM55JH014658; Mon, 16 Dec 2019 22:05:05 GMT (envelope-from phil@FreeBSD.org) Received: (from phil@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBGM55fw014657; Mon, 16 Dec 2019 22:05:05 GMT (envelope-from phil@FreeBSD.org) Message-Id: <201912162205.xBGM55fw014657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: phil set sender to phil@FreeBSD.org using -f From: Phil Shafer Date: Mon, 16 Dec 2019 22:05:05 +0000 (UTC) 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 X-SVN-Group: vendor X-SVN-Commit-Author: phil X-SVN-Commit-Paths: 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 X-SVN-Commit-Revision: 355826 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2019 22:05:05 -0000 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"