From owner-svn-ports-head@freebsd.org Sat Jan 28 14:33:44 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AD346CC5722; Sat, 28 Jan 2017 14:33:44 +0000 (UTC) (envelope-from marino@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 mx1.freebsd.org (Postfix) with ESMTPS id 62E9DEE0; Sat, 28 Jan 2017 14:33:44 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0SEXhOw018980; Sat, 28 Jan 2017 14:33:43 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0SEXhiw018978; Sat, 28 Jan 2017 14:33:43 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201701281433.v0SEXhiw018978@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 28 Jan 2017 14:33:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432627 - head/ftp/fastdfs/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2017 14:33:44 -0000 Author: marino Date: Sat Jan 28 14:33:43 2017 New Revision: 432627 URL: https://svnweb.freebsd.org/changeset/ports/432627 Log: ftp/fastdfs: Add explicit -L flag to link libfastcommon Supports non-default LOCALBASE and compilers that don't look in /usr/local/lib by default. It adjusts already existing patches. Approved by: just-fix-it Modified: head/ftp/fastdfs/files/patch-client-Makefile.in head/ftp/fastdfs/files/patch-storage-Makefile.in head/ftp/fastdfs/files/patch-tracker-Makefile.in Modified: head/ftp/fastdfs/files/patch-client-Makefile.in ============================================================================== --- head/ftp/fastdfs/files/patch-client-Makefile.in Sat Jan 28 14:31:08 2017 (r432626) +++ head/ftp/fastdfs/files/patch-client-Makefile.in Sat Jan 28 14:33:43 2017 (r432627) @@ -5,8 +5,9 @@ ENABLE_STATIC_LIB = $(ENABLE_STATIC_LIB) ENABLE_SHARED_LIB = $(ENABLE_SHARED_LIB) -INC_PATH = -I../common -I../tracker -I/usr/include/fastcommon +-LIB_PATH = $(LIBS) -lfastcommon +INC_PATH = -I../common -I../tracker -I$(LOCALBASE)/include/fastcommon - LIB_PATH = $(LIBS) -lfastcommon ++LIB_PATH = $(LIBS) -L${LOCALBASE}/lib -lfastcommon TARGET_PATH = $(TARGET_PREFIX)/bin -TARGET_LIB = $(TARGET_PREFIX)/lib64 +TARGET_LIB = $(TARGET_PREFIX)/lib Modified: head/ftp/fastdfs/files/patch-storage-Makefile.in ============================================================================== --- head/ftp/fastdfs/files/patch-storage-Makefile.in Sat Jan 28 14:31:08 2017 (r432626) +++ head/ftp/fastdfs/files/patch-storage-Makefile.in Sat Jan 28 14:33:43 2017 (r432627) @@ -1,14 +1,16 @@ --- storage/Makefile.in.orig 2016-08-08 07:17:50 UTC +++ storage/Makefile.in -@@ -1,7 +1,7 @@ +@@ -1,8 +1,8 @@ .SUFFIXES: .c .o COMPILE = $(CC) $(CFLAGS) -INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I/usr/include/fastcommon +-LIB_PATH = $(LIBS) -lfastcommon +INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I$(LOCALBASE)/include/fastcommon - LIB_PATH = $(LIBS) -lfastcommon ++LIB_PATH = $(LIBS) -L${LOCALBASE}/lib -lfastcommon TARGET_PATH = $(TARGET_PREFIX)/bin CONFIG_PATH = $(TARGET_CONF_PATH) + @@ -34,7 +34,7 @@ all: $(ALL_OBJS) $(ALL_PRGS) install: mkdir -p $(TARGET_PATH) Modified: head/ftp/fastdfs/files/patch-tracker-Makefile.in ============================================================================== --- head/ftp/fastdfs/files/patch-tracker-Makefile.in Sat Jan 28 14:31:08 2017 (r432626) +++ head/ftp/fastdfs/files/patch-tracker-Makefile.in Sat Jan 28 14:33:43 2017 (r432627) @@ -1,14 +1,16 @@ --- tracker/Makefile.in.orig 2016-08-08 07:17:50 UTC +++ tracker/Makefile.in -@@ -1,7 +1,7 @@ +@@ -1,8 +1,8 @@ .SUFFIXES: .c .o COMPILE = $(CC) $(CFLAGS) -INC_PATH = -I../common -I/usr/include/fastcommon +-LIB_PATH = $(LIBS) -lfastcommon +INC_PATH = -I../common -I$(LOCALBASE)/include/fastcommon - LIB_PATH = $(LIBS) -lfastcommon ++LIB_PATH = $(LIBS) -L${LOCALBASE}/lib -lfastcommon TARGET_PATH = $(TARGET_PREFIX)/bin CONFIG_PATH = $(TARGET_CONF_PATH) + @@ -26,7 +26,8 @@ all: $(ALL_OBJS) $(ALL_PRGS) install: mkdir -p $(TARGET_PATH)