Date: Sat, 28 Jan 2017 14:33:43 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432627 - head/ftp/fastdfs/files Message-ID: <201701281433.v0SEXhiw018978@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701281433.v0SEXhiw018978>