diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-08 11:37:12 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-08 11:37:12 +0200 |
| commit | e8e868c14bc5ab6cf6a9e2507823e435520efe2a (patch) | |
| tree | d77981838c034d8819e745d2e1782128ee0bf2d6 /package/libusb/libusb-0.1.12-nocpp.patch | |
| parent | 6620ca7dfe3d3340eee4ea662d97ee611d84814f (diff) | |
| parent | 6caec6f3b3aecf41c3a051ffa4b5d9a2e41775ca (diff) | |
Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot
Fix merge conflicts in CHANGES
Diffstat (limited to 'package/libusb/libusb-0.1.12-nocpp.patch')
| -rw-r--r-- | package/libusb/libusb-0.1.12-nocpp.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/package/libusb/libusb-0.1.12-nocpp.patch b/package/libusb/libusb-0.1.12-nocpp.patch deleted file mode 100644 index de1a8c7db..000000000 --- a/package/libusb/libusb-0.1.12-nocpp.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libusb-0.1.12/Makefile.am 2006-03-04 13:52:46.000000000 +1100 -+++ libusb-0.1.12/Makefile.am.new 2007-11-08 16:25:38.000000000 +1100 -@@ -4,7 +4,7 @@ - # gnu strictness chokes on README being autogenerated - AUTOMAKE_OPTIONS = 1.4 foreign - --SUBDIRS = . tests doc -+SUBDIRS = . doc - - AM_CFLAGS = -Werror - -@@ -19,7 +19,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 - |