37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
|
From 8c6b635bdb29cd2068864a00256c6336968802e7 Mon Sep 17 00:00:00 2001
|
||
|
|
Date: Fri, 19 May 2017 13:05:59 +0300
|
||
|
|
Subject: Убрать rpath на внутренний путь
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Убрали rpath на fs/root/build и теперь необходимо добавить линковку нужных объектных файлов в библиотеку
|
||
|
|
---
|
||
|
|
ftdipp/Makefile.in | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ftdipp/Makefile.in b/ftdipp/Makefile.in
|
||
|
|
index 1c537f0..a919e66 100644
|
||
|
|
--- a/ftdipp/Makefile.in
|
||
|
|
+++ b/ftdipp/Makefile.in
|
||
|
|
@@ -72,6 +72,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
|
||
|
|
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||
|
|
libftdipp_la_DEPENDENCIES = $(top_builddir)/src/libftdi.la
|
||
|
|
am_libftdipp_la_OBJECTS = ftdi.lo
|
||
|
|
+libftdi_DEPENDENCIES = .libs/ftdi.o
|
||
|
|
libftdipp_la_OBJECTS = $(am_libftdipp_la_OBJECTS)
|
||
|
|
libftdipp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
|
||
|
|
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
|
||
|
|
@@ -88,7 +89,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||
|
|
CXXLD = $(CXX)
|
||
|
|
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||
|
|
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
|
||
|
|
- $(LDFLAGS) -o $@
|
||
|
|
+ $(LDFLAGS) -o $(libftdi_DEPENDENCIES) $@
|
||
|
|
SOURCES = $(libftdipp_la_SOURCES)
|
||
|
|
DIST_SOURCES = $(libftdipp_la_SOURCES)
|
||
|
|
HEADERS = $(include_HEADERS)
|
||
|
|
--
|
||
|
|
2.16.4
|
||
|
|
|