diff options
Diffstat (limited to 'meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch')
-rw-r--r-- | meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch b/meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch new file mode 100644 index 000000000..de17808e1 --- /dev/null +++ b/meta-oe/recipes-support/dfu-util/dfu-util/0002-Revert-Makefile.am-Drop-static-dfu-util.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From 440a026379ff111aaa8314db1c29ffae8f482824 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin JaMa Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 11 Aug 2011 11:19:52 +0200 | ||
4 | Subject: [PATCH 2/2] Revert "Makefile.am: Drop static dfu-util" | ||
5 | |||
6 | This reverts commit fe0426ddc04f503d148c5e5f931f16b8f674f071. | ||
7 | |||
8 | Signed-off-by: Martin JaMa Jansa <Martin.Jansa@gmail.com> | ||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | configure.ac | 2 +- | ||
12 | src/Makefile.am | 20 +++++++++++++++++++- | ||
13 | 2 files changed, 20 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index fb58473..09b9e5a 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -23,7 +23,7 @@ AS_IF([test x$native_libusb = xno], [ | ||
20 | AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***])) | ||
21 | ]) | ||
22 | |||
23 | -LIBS="$LIBS $USB_LIBS" | ||
24 | +LIBS="$LIBS $USB_LIBS -lpthread" | ||
25 | CFLAGS="$CFLAGS $USB_CFLAGS" | ||
26 | |||
27 | # Checks for header files. | ||
28 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
29 | index 99df307..28d53f7 100644 | ||
30 | --- a/src/Makefile.am | ||
31 | +++ b/src/Makefile.am | ||
32 | @@ -1,6 +1,6 @@ | ||
33 | AM_CFLAGS = -Wall | ||
34 | |||
35 | -bin_PROGRAMS = dfu-util dfu-suffix | ||
36 | +bin_PROGRAMS = dfu-util dfu-util_static dfu-suffix | ||
37 | dfu_util_SOURCES = main.c \ | ||
38 | portable.h \ | ||
39 | dfu_load.c \ | ||
40 | @@ -17,6 +17,24 @@ dfu_util_SOURCES = main.c \ | ||
41 | quirks.c \ | ||
42 | quirks.h | ||
43 | |||
44 | +dfu_util_static_SOURCES = main.c \ | ||
45 | + portable.h \ | ||
46 | + dfu_load.c \ | ||
47 | + dfu_load.h \ | ||
48 | + dfuse.c \ | ||
49 | + dfuse.h \ | ||
50 | + dfuse_mem.c \ | ||
51 | + dfuse_mem.h \ | ||
52 | + dfu.c \ | ||
53 | + dfu.h \ | ||
54 | + usb_dfu.h \ | ||
55 | + dfu_file.c \ | ||
56 | + dfu_file.h \ | ||
57 | + quirks.c \ | ||
58 | + quirks.h | ||
59 | + | ||
60 | +dfu_util_static_LDFLAGS = -static | ||
61 | + | ||
62 | dfu_suffix_SOURCES = suffix.c \ | ||
63 | dfu_file.h \ | ||
64 | dfu_file.c \ | ||
65 | -- | ||
66 | 2.0.2 | ||
67 | |||