From owner-svn-src-head@freebsd.org Sun May 31 17:20:18 2020 Return-Path: Delivered-To: svn-src-head@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 7C7D4339A6A; Sun, 31 May 2020 17:20:18 +0000 (UTC) (envelope-from tijl@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZlS22kY5z4QFW; Sun, 31 May 2020 17:20:18 +0000 (UTC) (envelope-from tijl@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 549CE1D456; Sun, 31 May 2020 17:20:18 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VHKIwC009498; Sun, 31 May 2020 17:20:18 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VHKHDm009496; Sun, 31 May 2020 17:20:17 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <202005311720.04VHKHDm009496@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 31 May 2020 17:20:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361663 - in head: etc/mtree lib/libxo/encoder/csv lib/libxo/libxo X-SVN-Group: head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head: etc/mtree lib/libxo/encoder/csv lib/libxo/libxo X-SVN-Commit-Revision: 361663 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 17:20:18 -0000 Author: tijl Date: Sun May 31 17:20:17 2020 New Revision: 361663 URL: https://svnweb.freebsd.org/changeset/base/361663 Log: Fix installation of libxo encoder modules. Because the install location was hardcoded in the Makefile as /usr/lib/libxo/encoder, the lib32 version was installed over the native version. Replace /usr/lib with ${LIBDIR}. Also define SHLIB_NAME instead of LIB + FILES. This prevents building a static library. MFC after: 2 weeks Modified: head/etc/mtree/BSD.lib32.dist head/lib/libxo/encoder/csv/Makefile head/lib/libxo/libxo/Makefile Modified: head/etc/mtree/BSD.lib32.dist ============================================================================== --- head/etc/mtree/BSD.lib32.dist Sun May 31 15:31:47 2020 (r361662) +++ head/etc/mtree/BSD.lib32.dist Sun May 31 17:20:17 2020 (r361663) @@ -12,5 +12,9 @@ .. i18n .. + libxo + encoder + .. + .. .. .. Modified: head/lib/libxo/encoder/csv/Makefile ============================================================================== --- head/lib/libxo/encoder/csv/Makefile Sun May 31 15:31:47 2020 (r361662) +++ head/lib/libxo/encoder/csv/Makefile Sun May 31 17:20:17 2020 (r361663) @@ -8,30 +8,17 @@ LIBXOSRC= ${SRCTOP}/contrib/libxo .PATH: ${LIBXOSRC}/encoder/csv -# We use FILES to install the encoder library under the proper/magic -# name, in the proper/magic directory. libxo looks for encoders from -# "--libxo encoder=name" as "${prefix}/lib/libxo/encoder/${name}.enc" -FILES = libenc_csv.so -FILESNAME_libenc_csv.so= csv.enc -FILESDIR = /usr/lib/libxo/encoder +SHLIBDIR= ${LIBDIR}/libxo/encoder +SHLIB_NAME= csv.enc -LIB= enc_csv -SHLIB_MAJOR=0 -SHLIB_NAME= lib${LIB}.so - SRCS= enc_csv.c CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR} -CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\" +CFLAGS+=-DXO_ENCODERDIR=\"${LIBDIR}/libxo/encoder\" LIBADD= util xo LDFLAGS += -L${.OBJDIR:H:H}/libxo WARNS?= 5 -# Need to define a fake "install" target to block the one in bsd.lib.mk, -# since that one will install our lib in the wrong place (/usr/lib/). -install: realinstall - .include -.include Modified: head/lib/libxo/libxo/Makefile ============================================================================== --- head/lib/libxo/libxo/Makefile Sun May 31 15:31:47 2020 (r361662) +++ head/lib/libxo/libxo/Makefile Sun May 31 17:20:17 2020 (r361663) @@ -16,7 +16,7 @@ SHLIB_MAJOR=0 SRCS= libxo.c xo_encoder.c xo_syslog.c CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR} -CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\" +CFLAGS+=-DXO_ENCODERDIR=\"${LIBDIR}/libxo/encoder\" INCS= xo.h xo_encoder.h INCSDIR=${INCLUDEDIR}/libxo