diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2008-02-13 15:06:55 +0000 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2008-02-13 15:06:55 +0000 |
| commit | 0c7108e0a2ce40d495d391f0d12a834482fd2b23 (patch) | |
| tree | 8c74db3fc61eea42ad00c25032067ab481d70e16 /patches | |
| parent | c812063c523e593937a7eb0fb51b4bd2c526273a (diff) | |
| download | ptxdist-0c7108e0a2ce40d495d391f0d12a834482fd2b23.tar.gz ptxdist-0c7108e0a2ce40d495d391f0d12a834482fd2b23.tar.xz | |
* fix linking of libusbpp
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7769 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/libusb-0.1.12/generic/autoreconf.diff | 28 | ||||
| -rw-r--r-- | patches/libusb-0.1.12/generic/fix-linking.diff | 28 | ||||
| -rw-r--r-- | patches/libusb-0.1.12/generic/series | 2 |
3 files changed, 58 insertions, 0 deletions
diff --git a/patches/libusb-0.1.12/generic/autoreconf.diff b/patches/libusb-0.1.12/generic/autoreconf.diff new file mode 100644 index 000000000..95e5c4614 --- /dev/null +++ b/patches/libusb-0.1.12/generic/autoreconf.diff @@ -0,0 +1,28 @@ +--- + Makefile.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +Index: b/Makefile.in +=================================================================== +--- a/Makefile.in ++++ b/Makefile.in +@@ -72,7 +72,6 @@ am__libusb_la_SOURCES_DIST = usb.c usbi. + @LINUX_API_TRUE@am__objects_1 = linux.lo + am_libusb_la_OBJECTS = usb.lo error.lo descriptors.lo $(am__objects_1) + libusb_la_OBJECTS = $(am_libusb_la_OBJECTS) +-libusbpp_la_LIBADD = + am_libusbpp_la_OBJECTS = usbpp.lo + libusbpp_la_OBJECTS = $(am_libusbpp_la_OBJECTS) + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +@@ -295,7 +294,10 @@ libusbpp_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -release $(LT_RELEASE) \ + -export-dynamic \ +- $(LDADDS) -lusb $(PREBIND_FLAGSPP) ++ $(LDADDS) $(PREBIND_FLAGSPP) ++ ++libusbpp_la_LIBADD = \ ++ $(top_builddir)/libusb.la + + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/patches/libusb-0.1.12/generic/fix-linking.diff b/patches/libusb-0.1.12/generic/fix-linking.diff new file mode 100644 index 000000000..42e501019 --- /dev/null +++ b/patches/libusb-0.1.12/generic/fix-linking.diff @@ -0,0 +1,28 @@ +Subject: fix linking of libusbpp.so +From: Michael Olbrich <m.olbrich@pengutronix.de> + +If available "-lusb" will be expanded into /usr/lib/libusb.so. +Explicitly link against the local libusb.la to avoid this. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> + +--- + Makefile.am | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +Index: b/Makefile.am +=================================================================== +--- a/Makefile.am ++++ b/Makefile.am +@@ -66,7 +66,10 @@ libusbpp_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -release $(LT_RELEASE) \ + -export-dynamic \ +- $(LDADDS) -lusb $(PREBIND_FLAGSPP) ++ $(LDADDS) $(PREBIND_FLAGSPP) ++ ++libusbpp_la_LIBADD = \ ++ $(top_builddir)/libusb.la + + .PHONY: files release snapshot + diff --git a/patches/libusb-0.1.12/generic/series b/patches/libusb-0.1.12/generic/series new file mode 100644 index 000000000..016eea85d --- /dev/null +++ b/patches/libusb-0.1.12/generic/series @@ -0,0 +1,2 @@ +fix-linking.diff +autoreconf.diff |