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 /devel/libfastcommon/files/patch-src_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 'devel/libfastcommon/files/patch-src_Makefile.in')
| -rw-r--r-- | devel/libfastcommon/files/patch-src_Makefile.in | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/devel/libfastcommon/files/patch-src_Makefile.in b/devel/libfastcommon/files/patch-src_Makefile.in index e511d87efa9f..c4f2e2c5a6e3 100644 --- a/devel/libfastcommon/files/patch-src_Makefile.in +++ b/devel/libfastcommon/files/patch-src_Makefile.in @@ -1,28 +1,22 @@ ---- src/Makefile.in.orig 2016-09-08 07:44:31 UTC +--- src/Makefile.in.orig 2019-12-25 12:35:44 UTC +++ src/Makefile.in -@@ -41,7 +41,7 @@ ALL_LIBS = $(SHARED_LIBS) $(STATIC_LIBS) +@@ -51,7 +51,7 @@ ALL_LIBS = $(SHARED_LIBS) $(STATIC_LIBS) all: $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS) - libfastcommon.so: -- $(COMPILE) -o $@ $< -shared $(FAST_SHARED_OBJS) $(LIB_PATH) -+ $(COMPILE) -o $@ $< -shared -Wl,-soname,libfastcommon.so $(FAST_SHARED_OBJS) $(LIB_PATH) + libfastcommon.so: $(FAST_SHARED_OBJS) +- $(COMPILE) -o $@ -shared $(FAST_SHARED_OBJS) $(LIB_PATH) ++ $(COMPILE) -o $@ -shared -Wl,-soname,libfastcommon.so $(FAST_SHARED_OBJS) $(LIB_PATH) libfastcommon.a: $(FAST_STATIC_OBJS) ar rcs $@ $(FAST_STATIC_OBJS) .o: -@@ -53,12 +53,10 @@ libfastcommon.a: $(FAST_STATIC_OBJS) - .c.lo: - $(COMPILE) -c -fPIC -o $@ $< $(INC_PATH) - install: -- mkdir -p $(DESTDIR)/usr/$(LIB_VERSION) -- mkdir -p $(DESTDIR)/usr/lib -- install -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/$(LIB_VERSION) -- install -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/lib -- mkdir -p $(DESTDIR)/usr/include/fastcommon -- install -m 644 $(HEADER_FILES) $(DESTDIR)/usr/include/fastcommon -+ mkdir -p $(DESTDIR)$(PREFIX)/$(LIB_VERSION) -+ ${BSD_INSTALL_LIB} $(SHARED_LIBS) $(DESTDIR)$(PREFIX)/$(LIB_VERSION) -+ mkdir -p $(DESTDIR)$(PREFIX)/include/fastcommon -+ ${BSD_INSTALL_DATA} $(HEADER_FILES) $(DESTDIR)$(PREFIX)/include/fastcommon +@@ -67,8 +67,8 @@ install: + mkdir -p $(TARGET_PREFIX)/lib + mkdir -p $(TARGET_PREFIX)/include/fastcommon + +- install -m 755 $(SHARED_LIBS) $(TARGET_LIB) +- install -m 644 $(HEADER_FILES) $(TARGET_PREFIX)/include/fastcommon ++ ${BSD_INSTALL_LIB} $(SHARED_LIBS) $(TARGET_LIB) ++ ${BSD_INSTALL_DATA} $(HEADER_FILES) $(TARGET_PREFIX)/include/fastcommon + if [ ! -e $(TARGET_PREFIX)/lib/libfastcommon.so ]; then ln -s $(TARGET_LIB)/libfastcommon.so $(TARGET_PREFIX)/lib/libfastcommon.so; fi clean: rm -f $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS) - |