diff options
| author | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2020-07-03 15:13:58 +0000 |
|---|---|---|
| committer | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2020-07-03 15:13:58 +0000 |
| commit | 61c827b33eb6e83a20977a661ceb5d0f00ee078e (patch) | |
| tree | 8fa417fd262b07f6a38fbbb6998c4e22b82dee2d /ftp/fastdfs/files/patch-client-Makefile.in | |
| parent | Fix build with non-default LOCALBASE, PREFIX (diff) | |
Update to 6.06
PR: 246912
Submitted by: Daniel Ylitalo <daniel@blodan.se> (maintainer)
Notes
Notes:
svn path=/head/; revision=541116
Diffstat (limited to '')
| -rw-r--r-- | ftp/fastdfs/files/patch-client-Makefile.in | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/ftp/fastdfs/files/patch-client-Makefile.in b/ftp/fastdfs/files/patch-client-Makefile.in index 1adae60f9b07..fc22e2a0101d 100644 --- a/ftp/fastdfs/files/patch-client-Makefile.in +++ b/ftp/fastdfs/files/patch-client-Makefile.in @@ -1,28 +1,25 @@ ---- client/Makefile.in.orig 2016-08-08 07:17:50 UTC +--- client/Makefile.in.orig 2019-12-30 23:36:03 UTC +++ client/Makefile.in -@@ -3,10 +3,10 @@ +@@ -3,8 +3,8 @@ COMPILE = $(CC) $(CFLAGS) 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 ++INC_PATH = -I../common -I../tracker -I$(LOCALBASE)/include +LIB_PATH = $(LIBS) -L${LOCALBASE}/lib -lfastcommon TARGET_PATH = $(TARGET_PREFIX)/bin --TARGET_LIB = $(TARGET_PREFIX)/lib64 -+TARGET_LIB = $(TARGET_PREFIX)/lib + TARGET_LIB = $(TARGET_PREFIX)/$(LIB_VERSION) TARGET_INC = $(TARGET_PREFIX)/include - CONFIG_PATH = $(TARGET_CONF_PATH) - @@ -50,7 +50,8 @@ ALL_LIBS = $(STATIC_LIBS) $(SHARED_LIBS) all: $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS) libfdfsclient.so: - $(COMPILE) -o $@ $< -shared $(FDFS_SHARED_OBJS) $(LIB_PATH) + $(COMPILE) -o $@ $< -shared $(FDFS_SHARED_OBJS) $(LIB_PATH) \ -+ -Wl,-soname,libfdfsclient.so ++ -Wl,-soname,libfdfsclient.so libfdfsclient.a: - ar cru $@ $< $(FDFS_STATIC_OBJS) + ar rcs $@ $< $(FDFS_STATIC_OBJS) .o: @@ -66,9 +67,9 @@ install: mkdir -p $(CONFIG_PATH) |