patch file cleanup... ick.. kaloz you owe me some love
git-svn-id: svn://svn.openwrt.org/openwrt/packages@6526 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
106
libs/libusb/patches/001-no_libusbpp.patch
Normal file
106
libs/libusb/patches/001-no_libusbpp.patch
Normal file
@ -0,0 +1,106 @@
|
||||
--- libusb-0.1.12/Makefile.in.old 2007-01-04 16:36:50.000000000 -0700
|
||||
+++ libusb-0.1.12/Makefile.in 2007-01-04 16:42:55.000000000 -0700
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
|
||||
-SOURCES = $(libusb_la_SOURCES) $(libusbpp_la_SOURCES)
|
||||
+SOURCES = $(libusb_la_SOURCES)
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
@@ -73,8 +73,8 @@
|
||||
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)
|
||||
+am_libusbpp_la_OBJECTS =
|
||||
+libusbpp_la_OBJECTS =
|
||||
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
|
||||
SCRIPTS = $(bin_SCRIPTS)
|
||||
DEFAULT_INCLUDES =
|
||||
@@ -82,8 +82,7 @@
|
||||
am__depfiles_maybe = depfiles
|
||||
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bsd.Plo ./$(DEPDIR)/darwin.Plo \
|
||||
@AMDEP_TRUE@ ./$(DEPDIR)/descriptors.Plo ./$(DEPDIR)/error.Plo \
|
||||
-@AMDEP_TRUE@ ./$(DEPDIR)/linux.Plo ./$(DEPDIR)/usb.Plo \
|
||||
-@AMDEP_TRUE@ ./$(DEPDIR)/usbpp.Plo
|
||||
+@AMDEP_TRUE@ ./$(DEPDIR)/linux.Plo ./$(DEPDIR)/usb.Plo
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
|
||||
@@ -100,8 +99,8 @@
|
||||
CXXLD = $(CXX)
|
||||
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
-SOURCES = $(libusb_la_SOURCES) $(libusbpp_la_SOURCES)
|
||||
-DIST_SOURCES = $(am__libusb_la_SOURCES_DIST) $(libusbpp_la_SOURCES)
|
||||
+SOURCES = $(libusb_la_SOURCES)
|
||||
+DIST_SOURCES = $(am__libusb_la_SOURCES_DIST)
|
||||
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
||||
html-recursive info-recursive install-data-recursive \
|
||||
install-exec-recursive install-info-recursive \
|
||||
@@ -256,7 +255,7 @@
|
||||
# require automake 1.4
|
||||
# gnu strictness chokes on README being autogenerated
|
||||
AUTOMAKE_OPTIONS = 1.4 foreign
|
||||
-SUBDIRS = . tests doc
|
||||
+SUBDIRS = .
|
||||
AM_CFLAGS = -Werror $(AM_CFLAGS_EXT)
|
||||
configincludedir = $(pkglibdir)/include
|
||||
bin_SCRIPTS = libusb-config
|
||||
@@ -265,7 +264,7 @@
|
||||
apidocs/footer.html apidocs/doxygen.css apidocs/doxygen.png libusb.pc.in
|
||||
|
||||
EXTRA_libusb_la_SOURCE = linux.c linux.h bsd.c darwin.c
|
||||
-lib_LTLIBRARIES = libusb.la libusbpp.la
|
||||
+lib_LTLIBRARIES = libusb.la
|
||||
pkgconfig_DATA = libusb.pc
|
||||
@BSD_API_FALSE@@DARWIN_API_FALSE@@LINUX_API_FALSE@OS_SUPPORT =
|
||||
@BSD_API_FALSE@@DARWIN_API_TRUE@@LINUX_API_FALSE@OS_SUPPORT = darwin.c
|
||||
@@ -278,25 +277,19 @@
|
||||
AM_CPPFLAGS = -I.
|
||||
AM_CXXFLAGS =
|
||||
libusb_la_SOURCES = usb.c usbi.h error.c error.h descriptors.c $(OS_SUPPORT)
|
||||
-libusbpp_la_SOURCES = usbpp.cpp usbpp.h
|
||||
+libusbpp_la_SOURCES =
|
||||
libusbpp_la_DEPENDENCIES = libusb.la
|
||||
|
||||
# Do not add usb.h to *_SOURCES, regardless of dependencies.
|
||||
# It would be added to the dist tarball, which it shouldn't be.
|
||||
nodist_include_HEADERS = usb.h
|
||||
-include_HEADERS = usbpp.h
|
||||
+include_HEADERS =
|
||||
libusb_la_LDFLAGS = \
|
||||
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
||||
-release $(LT_RELEASE) \
|
||||
-export-dynamic \
|
||||
$(LDADDS) $(PREBIND_FLAGS)
|
||||
|
||||
-libusbpp_la_LDFLAGS = \
|
||||
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
||||
- -release $(LT_RELEASE) \
|
||||
- -export-dynamic \
|
||||
- $(LDADDS) -lusb $(PREBIND_FLAGSPP)
|
||||
-
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@@ -395,8 +388,6 @@
|
||||
done
|
||||
libusb.la: $(libusb_la_OBJECTS) $(libusb_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(libdir) $(libusb_la_LDFLAGS) $(libusb_la_OBJECTS) $(libusb_la_LIBADD) $(LIBS)
|
||||
-libusbpp.la: $(libusbpp_la_OBJECTS) $(libusbpp_la_DEPENDENCIES)
|
||||
- $(CXXLINK) -rpath $(libdir) $(libusbpp_la_LDFLAGS) $(libusbpp_la_OBJECTS) $(libusbpp_la_LIBADD) $(LIBS)
|
||||
install-binSCRIPTS: $(bin_SCRIPTS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
|
||||
@@ -429,7 +420,6 @@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usb.Plo@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usbpp.Plo@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
Reference in New Issue
Block a user