diff options
| author | marino <marino@FreeBSD.org> | 2017-01-28 22:33:43 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2017-01-28 22:33:43 +0800 |
| commit | eef2c62d06e070845930734bdc58d263abf9815a (patch) | |
| tree | c54ac8cd870752ad3ebe71de96401bf489c1630b /ftp | |
| parent | 7ccfd857abe2a2ecfe192e9be23e649741baaa59 (diff) | |
| download | freebsd-ports-gnome-eef2c62d06e070845930734bdc58d263abf9815a.tar.gz freebsd-ports-gnome-eef2c62d06e070845930734bdc58d263abf9815a.tar.zst freebsd-ports-gnome-eef2c62d06e070845930734bdc58d263abf9815a.zip | |
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
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/fastdfs/files/patch-client-Makefile.in | 3 | ||||
| -rw-r--r-- | ftp/fastdfs/files/patch-storage-Makefile.in | 6 | ||||
| -rw-r--r-- | ftp/fastdfs/files/patch-tracker-Makefile.in | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/ftp/fastdfs/files/patch-client-Makefile.in b/ftp/fastdfs/files/patch-client-Makefile.in index 9d31939b16f8..1adae60f9b07 100644 --- a/ftp/fastdfs/files/patch-client-Makefile.in +++ b/ftp/fastdfs/files/patch-client-Makefile.in @@ -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 diff --git a/ftp/fastdfs/files/patch-storage-Makefile.in b/ftp/fastdfs/files/patch-storage-Makefile.in index 6db80da6b740..095b7f770cec 100644 --- a/ftp/fastdfs/files/patch-storage-Makefile.in +++ b/ftp/fastdfs/files/patch-storage-Makefile.in @@ -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) diff --git a/ftp/fastdfs/files/patch-tracker-Makefile.in b/ftp/fastdfs/files/patch-tracker-Makefile.in index 1ee70efc45e5..01757c3a17f1 100644 --- a/ftp/fastdfs/files/patch-tracker-Makefile.in +++ b/ftp/fastdfs/files/patch-tracker-Makefile.in @@ -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) |