mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-03 01:23:49 +00:00
Code Issues Releases Activity

ftp/fastdfs: Add explicit -L flag to link libfastcommon

Browse Source 
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
This commit is contained in:
John Marino 2017-01-28 14:33:43 +00:00
parent 677146d9f2
commit cc875c39f3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=432627
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ftp/fastdfs/files/patch-client-Makefile.in
View File

@ -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

6
ftp/fastdfs/files/patch-storage-Makefile.in
View File

@ -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)

6
ftp/fastdfs/files/patch-tracker-Makefile.in
View File

@ -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)