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/usb_modeswitch/usb_modeswitch-1.0.7-build-system-fix.patch | |
| parent | 6620ca7dfe3d3340eee4ea662d97ee611d84814f (diff) | |
| parent | 6caec6f3b3aecf41c3a051ffa4b5d9a2e41775ca (diff) | |
| download | buildroot-novena-e8e868c14bc5ab6cf6a9e2507823e435520efe2a.tar.gz buildroot-novena-e8e868c14bc5ab6cf6a9e2507823e435520efe2a.zip | |
Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot
Fix merge conflicts in CHANGES
Diffstat (limited to 'package/usb_modeswitch/usb_modeswitch-1.0.7-build-system-fix.patch')
| -rw-r--r-- | package/usb_modeswitch/usb_modeswitch-1.0.7-build-system-fix.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/usb_modeswitch/usb_modeswitch-1.0.7-build-system-fix.patch b/package/usb_modeswitch/usb_modeswitch-1.0.7-build-system-fix.patch new file mode 100644 index 000000000..71dbc7a6d --- /dev/null +++ b/package/usb_modeswitch/usb_modeswitch-1.0.7-build-system-fix.patch @@ -0,0 +1,29 @@ +--- + Makefile | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +Index: usb_modeswitch-1.0.7/Makefile +=================================================================== +--- usb_modeswitch-1.0.7.orig/Makefile ++++ usb_modeswitch-1.0.7/Makefile +@@ -1,8 +1,8 @@ + PROG = usb_modeswitch + VERS = 1.0.7 + STRIP = strip +-CC = gcc +-CCFLAGS = -l usb -Wall ++CC ?= gcc ++CFLAGS += -l usb -Wall + RM = /bin/rm -f + OBJS = usb_modeswitch.c + PREFIX = $(DESTDIR)/usr +@@ -12,8 +12,7 @@ + .PHONY: clean + all: $(PROG) + $(PROG): $(OBJS) +- $(CC) $(CCFLAGS) -o $(PROG) $(OBJS) +- $(STRIP) $(PROG) ++ $(CC) $(CFLAGS) -o $(PROG) $(OBJS) + + clean: + $(RM) ./usb_modeswitch |