diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2018-09-13 10:35:19 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-09 14:38:04 +0200 |
| commit | b7a6b838cdd86256d60f1fd05476049d20cc9fef (patch) | |
| tree | d52f41b496c2d6e999455ccd1561e3bce22d8a92 /patches/usb-modeswitch-2.5.2 | |
| parent | 1e734742432ef2e257ebc64da40fbd6f099608a8 (diff) | |
| download | ptxdist-b7a6b838cdd86256d60f1fd05476049d20cc9fef.tar.gz ptxdist-b7a6b838cdd86256d60f1fd05476049d20cc9fef.tar.xz | |
usb_modeswitch: link dispatcher against JimTcl
Link dispatcher script with JimTcl library to lower footprint.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/usb-modeswitch-2.5.2')
| -rw-r--r-- | patches/usb-modeswitch-2.5.2/0001-Use-system-jimtcl.patch | 50 | ||||
| -rw-r--r-- | patches/usb-modeswitch-2.5.2/series | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/patches/usb-modeswitch-2.5.2/0001-Use-system-jimtcl.patch b/patches/usb-modeswitch-2.5.2/0001-Use-system-jimtcl.patch new file mode 100644 index 000000000..1de216e86 --- /dev/null +++ b/patches/usb-modeswitch-2.5.2/0001-Use-system-jimtcl.patch @@ -0,0 +1,50 @@ +From aba59dfbd135cd91802c9dccdb5e2b37c377f5ab Mon Sep 17 00:00:00 2001 +From: Ladislav Michl <ladis@linux-mips.org> +Date: Tue, 11 Sep 2018 19:09:41 +0200 +Subject: [PATCH] Use system jimtcl + +--- + Makefile | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/Makefile b/Makefile +index 463a11f..42c3de6 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,6 +3,7 @@ VERS = 2.5.2 + CC ?= gcc + CFLAGS += -Wall + LIBS = `pkg-config --libs --cflags libusb-1.0` ++JIMTCL = `pkg-config --libs --cflags jimtcl` + RM = /bin/rm -f + OBJS = usb_modeswitch.c + PREFIX = $(DESTDIR)/usr +@@ -13,12 +14,8 @@ UDEVDIR = $(DESTDIR)/lib/udev + SBINDIR = $(PREFIX)/sbin + MANDIR = $(PREFIX)/share/man/man1 + VPATH = jimtcl +-HOST_TCL := $(shell cd jim && ./autosetup/find-tclsh) +-ifeq (,$(findstring jimsh0,$(HOST_TCL))) +-TCL ?= $(HOST_TCL) +-else +-TCL ?= /usr/bin/tclsh +-endif ++HOST_TCL ?= /usr/bin/tclsh ++TCL ?= /usr/bin/tclsh + JIM_CONFIGURE_OPTS = --disable-lineedit \ + --with-out-jim-ext="stdlib posix load signal syslog" --prefix=/usr + +@@ -49,8 +46,8 @@ jim/libjim.a: + dispatcher-script: usb_modeswitch.tcl + sed 's_!/usr/bin/tclsh_!'"$(TCL)"'_' < usb_modeswitch.tcl > usb_modeswitch_dispatcher + +-dispatcher-shared: jim/libjim.so dispatcher.c usb_modeswitch.string +- $(CC) dispatcher.c $(LDFLAGS) -Ljim -ljim -Ijim -o usb_modeswitch_dispatcher $(CFLAGS) ++dispatcher-shared: dispatcher.c usb_modeswitch.string ++ $(CC) dispatcher.c $(LDFLAGS) $(JIMTCL) -o usb_modeswitch_dispatcher $(CFLAGS) + + dispatcher-static: jim/libjim.a dispatcher.c usb_modeswitch.string + $(CC) dispatcher.c $(LDFLAGS) jim/libjim.a -Ijim -o usb_modeswitch_dispatcher $(CFLAGS) +-- +2.19.0 + diff --git a/patches/usb-modeswitch-2.5.2/series b/patches/usb-modeswitch-2.5.2/series new file mode 100644 index 000000000..cb735aa0d --- /dev/null +++ b/patches/usb-modeswitch-2.5.2/series @@ -0,0 +1 @@ +0001-Use-system-jimtcl.patch |