From owner-svn-src-head@FreeBSD.ORG Mon Oct 13 22:25:47 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85144538; Mon, 13 Oct 2014 22:25:47 +0000 (UTC) Received: from mail-wi0-x232.google.com (mail-wi0-x232.google.com [IPv6:2a00:1450:400c:c05::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A093A9CA; Mon, 13 Oct 2014 22:25:46 +0000 (UTC) Received: by mail-wi0-f178.google.com with SMTP id h11so5093141wiw.11 for ; Mon, 13 Oct 2014 15:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=/R8JyOA3X8kd+4E4XhGlMKFcioyf1cxRXzX/f1LGpDg=; b=QJO0/JXbaKl2TPmiKolU97MCo+slHEoHWzGMoIxzOpEU3c468JAAsqFqKu2Vai+BEC RPmOq44FrA9UG3EDgBzadiFVd7BuXhcIw+ruEjeVP28I1uahXi4zC26XyvM6tMARj53I hHj2isKCjAnV39cAA1/kORERW8Zco4e+e2/xTMEO9HAx75KZhkSe8SdaAvLZigBrdIQn Yz4K/998PpEepxcTT9JhbKHNifZ1PvOsReTJmCsntC2/xyJzbhFTrXHlco89RmoEUHRz 7HzNFqQw56dWSI8AFgq7hmvWo1PbWpwntF2CKFdIu2VrzYY6cE4CQam8ZvCrDqJ4A+Zr G2ew== X-Received: by 10.180.9.65 with SMTP id x1mr1703055wia.30.1413239144811; Mon, 13 Oct 2014 15:25:44 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id mb20sm13618313wic.9.2014.10.13.15.25.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Oct 2014 15:25:43 -0700 (PDT) Sender: Baptiste Daroussin Date: Tue, 14 Oct 2014 00:25:41 +0200 From: Baptiste Daroussin To: Xin LI Subject: Re: svn commit: r273065 - in head: lib lib/libevent share/mk usr.sbin/ftp-proxy usr.sbin/ftp-proxy/ftp-proxy usr.sbin/ftp-proxy/libevent Message-ID: <20141013222541.GS19486@ivaldir.etoilebsd.net> References: <201410132215.s9DMFQHM003173@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="CRjAHycgiaTQGSqU" Content-Disposition: inline In-Reply-To: <201410132215.s9DMFQHM003173@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 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: Mon, 13 Oct 2014 22:25:47 -0000 --CRjAHycgiaTQGSqU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 13, 2014 at 10:15:26PM +0000, Xin LI wrote: > Author: delphij > Date: Mon Oct 13 22:15:26 2014 > New Revision: 273065 > URL: https://svnweb.freebsd.org/changeset/base/273065 >=20 > Log: > Promote libevent to lib/ level and fold ftp-proxy into its parent Makef= ile. > This allows us to use libevent for other application in the future. > =20 > For now libevent is still INTERNALLIB and no shared library is installe= d. > =20 > MFC after: 1 month >=20 > Added: > head/lib/libevent/ > - copied from r273060, head/usr.sbin/ftp-proxy/libevent/ > Deleted: > head/usr.sbin/ftp-proxy/Makefile.inc > head/usr.sbin/ftp-proxy/ftp-proxy/ > head/usr.sbin/ftp-proxy/libevent/ > Modified: > head/lib/Makefile > head/lib/libevent/Makefile > head/share/mk/src.libnames.mk > head/usr.sbin/ftp-proxy/Makefile >=20 > Modified: head/lib/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/lib/Makefile Mon Oct 13 21:08:27 2014 (r273064) > +++ head/lib/Makefile Mon Oct 13 22:15:26 2014 (r273065) > @@ -44,6 +44,7 @@ SUBDIR=3D ${SUBDIR_ORDERED} \ > libdevstat \ > libdwarf \ > libedit \ > + ${_libevent} \ > libexecinfo \ > libexpat \ > libfetch \ > @@ -226,6 +227,10 @@ _libnetgraph=3D libnetgraph > _libypclnt=3D libypclnt > .endif > =20 > +.if ${MK_PF} !=3D "no" > +_libevent=3D libevent > +.endif > + > .if ${MACHINE_CPUARCH} =3D=3D "i386" || ${MACHINE_CPUARCH} =3D=3D "amd64" > _libsmb=3D libsmb > _libvgl=3D libvgl >=20 > Modified: head/lib/libevent/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.sbin/ftp-proxy/libevent/Makefile Mon Oct 13 20:39:51 2014 (r= 273060) > +++ head/lib/libevent/Makefile Mon Oct 13 22:15:26 2014 (r273065) > @@ -1,10 +1,14 @@ > # $FreeBSD$ > =20 > -.PATH: ${.CURDIR}/../../../contrib/pf/libevent > +.PATH: ${.CURDIR}/../../contrib/pf/libevent > =20 > +.include > + > +LIB=3D event > +SHLIB_MAJOR=3D 1 > +PRIVATELIB=3D > +INTERNALLIB=3D Both PRIVATELIB and INTERNALLIB looks wrong I think you only want PRIVATELIB regards, Bapt --CRjAHycgiaTQGSqU Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlQ8UWUACgkQ8kTtMUmk6Ey/UACfdkbeCvyAXTZi56Yr1Q83AO0N bI4An3uhoLRg4u2qbyjH/kHEz1ZrXW6t =XsFp -----END PGP SIGNATURE----- --CRjAHycgiaTQGSqU--