[ptxdist] [PATCH v2 1/3] jimtcl: new package

[ptxdist] [PATCH v2 1/3] jimtcl: new package

[Ladislav Michl]

Jim is an opensource small-footprint implementation of the Tcl
programming language. So far only default set of features is
compiled in - lets see what users will really need.
This package is intended to replace Tcl (which is in staging
already) as it fits PTXdist more due to its small size.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 Changes:
 -v2: use http url to help poor firewalled developers in corporate

 rules/host-jimtcl.in   |  6 ++++
 rules/host-jimtcl.make | 33 ++++++++++++++++++
 rules/jimtcl.in        | 24 +++++++++++++
 rules/jimtcl.make      | 77 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 140 insertions(+)
 create mode 100644 rules/host-jimtcl.in
 create mode 100644 rules/host-jimtcl.make
 create mode 100644 rules/jimtcl.in
 create mode 100644 rules/jimtcl.make

diff --git a/rules/host-jimtcl.in b/rules/host-jimtcl.in
new file mode 100644
index 000000000..ccd2d23bd
--- /dev/null
+++ b/rules/host-jimtcl.in
@@ -0,0 +1,6 @@
+## SECTION=hosttools_noprompt
+## SECTION=hosttools_platform
+
+config HOST_JIMTCL
+	tristate
+	default ALLYES
diff --git a/rules/host-jimtcl.make b/rules/host-jimtcl.make
new file mode 100644
index 000000000..fa7b64057
--- /dev/null
+++ b/rules/host-jimtcl.make
@@ -0,0 +1,33 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Ladislav Michl <ladis@linux-mips.org>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_JIMTCL) += host-jimtcl
+
+#
+# Paths and names
+#
+HOST_JIMTCL	:= $(JIMTCL)
+HOST_JIMTCL_DIR	:= $(HOST_BUILDDIR)/$(HOST_JIMTCL)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# Package is not using autoconf but autosetup which is enough compatible...
+#
+HOST_JIMTCL_CONF_ENV	:= $(HOST_ENV)
+HOST_JIMTCL_CONF_TOOL	:= autoconf
+HOST_JIMTCL_CONF_OPT	:= --prefix=/usr 
+
+# vim: syntax=make
diff --git a/rules/jimtcl.in b/rules/jimtcl.in
new file mode 100644
index 000000000..8589160b9
--- /dev/null
+++ b/rules/jimtcl.in
@@ -0,0 +1,24 @@
+## SECTION=bytecode_engines
+
+config JIMTCL
+	tristate
+	prompt "jimtcl                        "
+	help
+	  Jim provides a powerful Tcl language implemented in roughly
+	  10k lines of code making it suitable for deployment on
+	  Embedded Systems.
+
+if JIMTCL
+
+config JIMTCL_SHELL
+	bool "install jimsh"
+	help
+	  Install Tcl shell on the target
+
+config JIMTCL_SYMLINK
+	bool "install tclsh symlink"
+	depends on JIMTCL_SHELL
+	help
+	  Make tclsh symlink to jimsh
+
+endif
diff --git a/rules/jimtcl.make b/rules/jimtcl.make
new file mode 100644
index 000000000..16a5e2ae3
--- /dev/null
+++ b/rules/jimtcl.make
@@ -0,0 +1,77 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Ladislav Michl <ladis@linux-mips.org>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_JIMTCL) += jimtcl
+
+#
+# Paths and names
+#
+JIMTCL_VERSION	:= 0.78
+JIMTCL_MD5	:= bde9021d78a77fe28e1bbc423142ab23
+JIMTCL		:= jimtcl-$(JIMTCL_VERSION)
+JIMTCL_SUFFIX	:= tar.xz
+JIMTCL_URL	:= http://repo.or.cz/jimtcl.git;tag=$(JIMTCL_VERSION)
+JIMTCL_SOURCE	:= $(SRCDIR)/$(JIMTCL).$(JIMTCL_SUFFIX)
+JIMTCL_DIR	:= $(BUILDDIR)/$(JIMTCL)
+JIMTCL_LICENSE	:= BSD-2-Clause 
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# Package is not using autoconf but autosetup which is enough compatible...
+#
+JIMTCL_CONF_ENV		:= $(CROSS_ENV)
+JIMTCL_CONF_TOOL	:= autoconf
+JIMTCL_CONF_OPT		:= \
+	$(CROSS_AUTOCONF_USR) \
+	--shared
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/jimtcl.install:
+	@$(call targetinfo)
+	@$(call world/install, JIMTCL)
+	@ln -sf libjim.so.$(JIMTCL_VERSION) $(JIMTCL_PKGDIR)/usr/lib/libjim.so
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/jimtcl.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, jimtcl)
+	@$(call install_fixup, jimtcl, PRIORITY, optional)
+	@$(call install_fixup, jimtcl, SECTION, base)
+	@$(call install_fixup, jimtcl, AUTHOR, "Ladislav Michl <ladis@linux-mips.org>")
+	@$(call install_fixup, jimtcl, DESCRIPTION, \
+		"A small footprint implementation of the Tcl programming language")
+
+ifdef PTXCONF_JIMTCL_SHELL
+	@$(call install_copy, jimtcl, 0, 0, 0755, -, /usr/bin/jimsh)
+ifdef PTXCONF_JIMTCL_SYMLINK
+	@$(call install_link, jimtcl, jimsh, /usr/bin/tclsh)
+endif
+endif
+	@$(call install_lib, jimtcl, 0, 0, 0644, libjim)
+
+	@$(call install_finish, jimtcl)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v3 2/3] usb_modeswitch: version bump 2.5.1 -> 2.5.2

[Ladislav Michl]

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 Changes:
 -v2: none
 -v3: none

 Perhaps this one could be applied right away as it does not make things
 any worse...

 rules/usb-modeswitch.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index 193a6eede..0f00e9c5c 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH) += usb-modeswitch
 #
 # Paths and names
 #
-USB_MODESWITCH_VERSION	:= 2.5.1
-USB_MODESWITCH_MD5	:= 7e6435a2afe7aed8574fe59cf09a3503
+USB_MODESWITCH_VERSION	:= 2.5.2
+USB_MODESWITCH_MD5	:= 16b9a8efa1bf8fbd7d5612757eae4f26
 USB_MODESWITCH		:= usb-modeswitch-$(USB_MODESWITCH_VERSION)
 USB_MODESWITCH_SUFFIX	:= tar.bz2
 USB_MODESWITCH_URL	:= http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX)
-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v3 3/3] usb_modeswitch: link dispatcher against JimTcl

[Ladislav Michl]

Link dispatcher script with JimTcl library to lower footprint.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 Changes:
 -v2: Link against JimTcl
 -v3: Fix dependecies

 .../0001-Use-system-jimtcl.patch              | 50 +++++++++++++++++++
 patches/usb-modeswitch-2.5.2/series           |  1 +
 rules/usb-modeswitch.in                       |  5 +-
 rules/usb-modeswitch.make                     | 10 ++--
 4 files changed, 60 insertions(+), 6 deletions(-)
 create mode 100644 patches/usb-modeswitch-2.5.2/0001-Use-system-jimtcl.patch
 create mode 100644 patches/usb-modeswitch-2.5.2/series

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
diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in
index 754e19304..28659915a 100644
--- a/rules/usb-modeswitch.in
+++ b/rules/usb-modeswitch.in
@@ -4,7 +4,8 @@ menuconfig USB_MODESWITCH
 	tristate
 	prompt "usb-modeswitch                "
 	select LIBUSB
-	select TCL if (USB_MODESWITCH_UDEV_HELPER || USB_MODESWITCH_SYSTEMD_UNIT) && RUNTIME
+	select JIMTCL if USB_MODESWITCH_UDEV_HELPER || USB_MODESWITCH_SYSTEMD_UNIT
+	select HOST_JIMTCL if USB_MODESWITCH_UDEV_HELPER || USB_MODESWITCH_SYSTEMD_UNIT
 	help
 	  USB_ModeSwitch is (surprise!) a mode switching tool
 	  for controlling 'multi-mode' USB devices.
@@ -15,13 +16,11 @@ config USB_MODESWITCH_UDEV_HELPER
 	bool "install udev helper"
 	default y
 	depends on UDEV
-	depends on STAGING
 
 config USB_MODESWITCH_SYSTEMD_UNIT
 	bool "install systemd unit file"
 	default y
 	depends on SYSTEMD
-	depends on STAGING
 
 endif
 
diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index 0f00e9c5c..4934d72c0 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -33,11 +33,15 @@ USB_MODESWITCH_LICENSE	:= GPL-2.0-only
 # autoconf
 #
 USB_MODESWITCH_CONF_TOOL	:= NO
-USB_MODESWITCH_MAKE_ENV		:= $(CROSS_ENV)
-USB_MODESWITCH_MAKE_OPT		:= $(CROSS_ENV_PROGS)
+USB_MODESWITCH_MAKE_ENV		:= \
+	$(CROSS_ENV) \
+	HOST_TCL=$(PTXCONF_SYSROOT_HOST)/usr/bin/jimsh
+USB_MODESWITCH_MAKE_OPT		:= \
+	$(CROSS_ENV_PROGS) \
+	shared
 USB_MODESWITCH_INSTALL_OPT	:= \
 	UDEVDIR=$(USB_MODESWITCH_PKGDIR)/usr/lib/udev \
-	install
+	install-shared
 
 # ----------------------------------------------------------------------------
 # Install
-- 
2.19.0

 

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2 1/3] jimtcl: new package

[Roland Hieber]

On Thu, Sep 13, 2018 at 10:32:26AM +0200, Ladislav Michl wrote:
[...]
> diff --git a/rules/jimtcl.make b/rules/jimtcl.make
> new file mode 100644
> index 000000000..16a5e2ae3
> --- /dev/null
> +++ b/rules/jimtcl.make
> @@ -0,0 +1,77 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2018 by Ladislav Michl <ladis@linux-mips.org>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_JIMTCL) += jimtcl
> +
> +#
> +# Paths and names
> +#
> +JIMTCL_VERSION	:= 0.78
> +JIMTCL_MD5	:= bde9021d78a77fe28e1bbc423142ab23
> +JIMTCL		:= jimtcl-$(JIMTCL_VERSION)
> +JIMTCL_SUFFIX	:= tar.xz
> +JIMTCL_URL	:= http://repo.or.cz/jimtcl.git;tag=$(JIMTCL_VERSION)
> +JIMTCL_SOURCE	:= $(SRCDIR)/$(JIMTCL).$(JIMTCL_SUFFIX)
> +JIMTCL_DIR	:= $(BUILDDIR)/$(JIMTCL)
> +JIMTCL_LICENSE	:= BSD-2-Clause 
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# Package is not using autoconf but autosetup which is enough compatible...
> +#
> +JIMTCL_CONF_ENV		:= $(CROSS_ENV)
> +JIMTCL_CONF_TOOL	:= autoconf
> +JIMTCL_CONF_OPT		:= \
> +	$(CROSS_AUTOCONF_USR) \
> +	--shared

configure_helper.py shows a lot of options which are not present here.
Did you take a look at them?

Also I noticed that Makefile.in sets

  CC = @CCACHE@ @CC@
  CXX = @CCACHE@ @CXX@

which, in my case, becomes

  CC = ccache arm-v7a-linux-gnueabihf-gcc
  CXX = ccache arm-v7a-linux-gnueabihf-g++

which is probably the reason why jimtcl.install fails because my ccache
is not set up correctly (I did not enable it in ptxdist setup).

I'm not sure how using ccache can be avoided without patching the build
system.

There is another error happening here in jimtcl.install, but i'm not
sure if it is related to the faulty ccache usage:

  jim-readdir.c: In function 'Jim_ReaddirCmd':
  jim-readdir.c:72:5: error: unknown type name 'DIR'
       DIR *dirPtr;
       ^~~
  make[1]: *** [jim-readdir.o] Error 1
  Makefile:65: recipe for target 'jim-readdir.o' failed


 - Roland

> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/jimtcl.install:
> +	@$(call targetinfo)
> +	@$(call world/install, JIMTCL)
> +	@ln -sf libjim.so.$(JIMTCL_VERSION) $(JIMTCL_PKGDIR)/usr/lib/libjim.so
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/jimtcl.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, jimtcl)
> +	@$(call install_fixup, jimtcl, PRIORITY, optional)
> +	@$(call install_fixup, jimtcl, SECTION, base)
> +	@$(call install_fixup, jimtcl, AUTHOR, "Ladislav Michl <ladis@linux-mips.org>")
> +	@$(call install_fixup, jimtcl, DESCRIPTION, \
> +		"A small footprint implementation of the Tcl programming language")
> +
> +ifdef PTXCONF_JIMTCL_SHELL
> +	@$(call install_copy, jimtcl, 0, 0, 0755, -, /usr/bin/jimsh)
> +ifdef PTXCONF_JIMTCL_SYMLINK
> +	@$(call install_link, jimtcl, jimsh, /usr/bin/tclsh)
> +endif
> +endif
> +	@$(call install_lib, jimtcl, 0, 0, 0644, libjim)
> +
> +	@$(call install_finish, jimtcl)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.19.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Roland Hieber                     | r.hieber@pengutronix.de     |
Pengutronix e.K.                  | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2 1/3] jimtcl: new package

[Ladislav Michl]

On Thu, Sep 13, 2018 at 11:59:37AM +0200, Roland Hieber wrote:
> On Thu, Sep 13, 2018 at 10:32:26AM +0200, Ladislav Michl wrote:
> [...]
> > diff --git a/rules/jimtcl.make b/rules/jimtcl.make
> > new file mode 100644
> > index 000000000..16a5e2ae3
> > --- /dev/null
> > +++ b/rules/jimtcl.make
> > @@ -0,0 +1,77 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2018 by Ladislav Michl <ladis@linux-mips.org>
> > +#
> > +# See CREDITS for details about who has contributed to this project.
> > +#
> > +# For further information about the PTXdist project and license conditions
> > +# see the README file.
> > +#
> > +
> > +#
> > +# We provide this package
> > +#
> > +PACKAGES-$(PTXCONF_JIMTCL) += jimtcl
> > +
> > +#
> > +# Paths and names
> > +#
> > +JIMTCL_VERSION	:= 0.78
> > +JIMTCL_MD5	:= bde9021d78a77fe28e1bbc423142ab23
> > +JIMTCL		:= jimtcl-$(JIMTCL_VERSION)
> > +JIMTCL_SUFFIX	:= tar.xz
> > +JIMTCL_URL	:= http://repo.or.cz/jimtcl.git;tag=$(JIMTCL_VERSION)
> > +JIMTCL_SOURCE	:= $(SRCDIR)/$(JIMTCL).$(JIMTCL_SUFFIX)
> > +JIMTCL_DIR	:= $(BUILDDIR)/$(JIMTCL)
> > +JIMTCL_LICENSE	:= BSD-2-Clause 
> > +
> > +# ----------------------------------------------------------------------------
> > +# Prepare
> > +# ----------------------------------------------------------------------------
> > +
> > +#
> > +# Package is not using autoconf but autosetup which is enough compatible...
> > +#
> > +JIMTCL_CONF_ENV		:= $(CROSS_ENV)
> > +JIMTCL_CONF_TOOL	:= autoconf
> > +JIMTCL_CONF_OPT		:= \
> > +	$(CROSS_AUTOCONF_USR) \
> > +	--shared
> 
> configure_helper.py shows a lot of options which are not present here.
> Did you take a look at them?

Yes. Those are related to commit log message :) As Tcl is in staging and
noone bothered I guess Tcl is not important to anyone and thus it does
not make sense to implement features noobody asks for. So jimtcl is here
only to make usb-nodeswitch happy which it does as it is.

> Also I noticed that Makefile.in sets
> 
>   CC = @CCACHE@ @CC@
>   CXX = @CCACHE@ @CXX@
> 
> which, in my case, becomes
> 
>   CC = ccache arm-v7a-linux-gnueabihf-gcc
>   CXX = ccache arm-v7a-linux-gnueabihf-g++
> 
> which is probably the reason why jimtcl.install fails because my ccache
> is not set up correctly (I did not enable it in ptxdist setup).

I did not enable it either. Which way does install fail in your case?

> I'm not sure how using ccache can be avoided without patching the build
> system.
> 
> There is another error happening here in jimtcl.install, but i'm not
> sure if it is related to the faulty ccache usage:
> 
>   jim-readdir.c: In function 'Jim_ReaddirCmd':
>   jim-readdir.c:72:5: error: unknown type name 'DIR'
>        DIR *dirPtr;
>        ^~~
>   make[1]: *** [jim-readdir.o] Error 1
>   Makefile:65: recipe for target 'jim-readdir.o' failed

I do not see this message, care to investigate more? Thank you.

>  - Roland
> 
> > +
> > +# ----------------------------------------------------------------------------
> > +# Install
> > +# ----------------------------------------------------------------------------
> > +
> > +$(STATEDIR)/jimtcl.install:
> > +	@$(call targetinfo)
> > +	@$(call world/install, JIMTCL)
> > +	@ln -sf libjim.so.$(JIMTCL_VERSION) $(JIMTCL_PKGDIR)/usr/lib/libjim.so
> > +	@$(call touch)
> > +
> > +# ----------------------------------------------------------------------------
> > +# Target-Install
> > +# ----------------------------------------------------------------------------
> > +
> > +$(STATEDIR)/jimtcl.targetinstall:
> > +	@$(call targetinfo)
> > +
> > +	@$(call install_init, jimtcl)
> > +	@$(call install_fixup, jimtcl, PRIORITY, optional)
> > +	@$(call install_fixup, jimtcl, SECTION, base)
> > +	@$(call install_fixup, jimtcl, AUTHOR, "Ladislav Michl <ladis@linux-mips.org>")
> > +	@$(call install_fixup, jimtcl, DESCRIPTION, \
> > +		"A small footprint implementation of the Tcl programming language")
> > +
> > +ifdef PTXCONF_JIMTCL_SHELL
> > +	@$(call install_copy, jimtcl, 0, 0, 0755, -, /usr/bin/jimsh)
> > +ifdef PTXCONF_JIMTCL_SYMLINK
> > +	@$(call install_link, jimtcl, jimsh, /usr/bin/tclsh)
> > +endif
> > +endif
> > +	@$(call install_lib, jimtcl, 0, 0, 0644, libjim)
> > +
> > +	@$(call install_finish, jimtcl)
> > +
> > +	@$(call touch)
> > +
> > +# vim: syntax=make
> > -- 
> > 2.19.0
> > 
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> 
> -- 
> Roland Hieber                     | r.hieber@pengutronix.de     |
> Pengutronix e.K.                  | https://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
> Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2 1/3] jimtcl: new package

[Michael Olbrich]

On Thu, Sep 13, 2018 at 12:38:47PM +0200, Ladislav Michl wrote:
> On Thu, Sep 13, 2018 at 11:59:37AM +0200, Roland Hieber wrote:
> > On Thu, Sep 13, 2018 at 10:32:26AM +0200, Ladislav Michl wrote:
> > [...]
> > > diff --git a/rules/jimtcl.make b/rules/jimtcl.make
> > > new file mode 100644
> > > index 000000000..16a5e2ae3
> > > --- /dev/null
> > > +++ b/rules/jimtcl.make
> > > @@ -0,0 +1,77 @@
> > > +# -*-makefile-*-
> > > +#
> > > +# Copyright (C) 2018 by Ladislav Michl <ladis@linux-mips.org>
> > > +#
> > > +# See CREDITS for details about who has contributed to this project.
> > > +#
> > > +# For further information about the PTXdist project and license conditions
> > > +# see the README file.
> > > +#
> > > +
> > > +#
> > > +# We provide this package
> > > +#
> > > +PACKAGES-$(PTXCONF_JIMTCL) += jimtcl
> > > +
> > > +#
> > > +# Paths and names
> > > +#
> > > +JIMTCL_VERSION	:= 0.78
> > > +JIMTCL_MD5	:= bde9021d78a77fe28e1bbc423142ab23
> > > +JIMTCL		:= jimtcl-$(JIMTCL_VERSION)
> > > +JIMTCL_SUFFIX	:= tar.xz
> > > +JIMTCL_URL	:= http://repo.or.cz/jimtcl.git;tag=$(JIMTCL_VERSION)
> > > +JIMTCL_SOURCE	:= $(SRCDIR)/$(JIMTCL).$(JIMTCL_SUFFIX)
> > > +JIMTCL_DIR	:= $(BUILDDIR)/$(JIMTCL)
> > > +JIMTCL_LICENSE	:= BSD-2-Clause 
> > > +
> > > +# ----------------------------------------------------------------------------
> > > +# Prepare
> > > +# ----------------------------------------------------------------------------
> > > +
> > > +#
> > > +# Package is not using autoconf but autosetup which is enough compatible...
> > > +#
> > > +JIMTCL_CONF_ENV		:= $(CROSS_ENV)
> > > +JIMTCL_CONF_TOOL	:= autoconf
> > > +JIMTCL_CONF_OPT		:= \
> > > +	$(CROSS_AUTOCONF_USR) \
> > > +	--shared
> > 
> > configure_helper.py shows a lot of options which are not present here.
> > Did you take a look at them?
> 
> Yes. Those are related to commit log message :) As Tcl is in staging and
> noone bothered I guess Tcl is not important to anyone and thus it does
> not make sense to implement features noobody asks for. So jimtcl is here
> only to make usb-nodeswitch happy which it does as it is.

It's not really autoconf, so you need to be careful which options are set,
but there is stuff that is autodetected, so that needs explicit options.
I think a lot of it is disabled by default, but at least lineedit and docs
should imho be disabled.

Also, this packages seems to use tclsh at configure and compile time. We
need a host-system-tcl to make sure tclsh is installed. Check with

type -P tclsh >/dev/null || ptxd_bailout "..."

I think.

> > Also I noticed that Makefile.in sets
> > 
> >   CC = @CCACHE@ @CC@
> >   CXX = @CCACHE@ @CXX@
> > 
> > which, in my case, becomes
> > 
> >   CC = ccache arm-v7a-linux-gnueabihf-gcc
> >   CXX = ccache arm-v7a-linux-gnueabihf-g++
> > 
> > which is probably the reason why jimtcl.install fails because my ccache
> > is not set up correctly (I did not enable it in ptxdist setup).
> 
> I did not enable it either. Which way does install fail in your case?

It fails if ccache is installed but does not work. Add 'CCACHE=none' to the
CONF_ENV.

> > I'm not sure how using ccache can be avoided without patching the build
> > system.
> > 
> > There is another error happening here in jimtcl.install, but i'm not
> > sure if it is related to the faulty ccache usage:
> > 
> >   jim-readdir.c: In function 'Jim_ReaddirCmd':
> >   jim-readdir.c:72:5: error: unknown type name 'DIR'
> >        DIR *dirPtr;
> >        ^~~
> >   make[1]: *** [jim-readdir.o] Error 1
> >   Makefile:65: recipe for target 'jim-readdir.o' failed
> 
> I do not see this message, care to investigate more? Thank you.

Roland: did you manually remove ccache from the Makefile, when this
happens? Maybe your ccache issue broke the header detection and
HAVE_DIRENT_H is not defined.

Michael

> >  - Roland
> > 
> > > +
> > > +# ----------------------------------------------------------------------------
> > > +# Install
> > > +# ----------------------------------------------------------------------------
> > > +
> > > +$(STATEDIR)/jimtcl.install:
> > > +	@$(call targetinfo)
> > > +	@$(call world/install, JIMTCL)
> > > +	@ln -sf libjim.so.$(JIMTCL_VERSION) $(JIMTCL_PKGDIR)/usr/lib/libjim.so
> > > +	@$(call touch)
> > > +
> > > +# ----------------------------------------------------------------------------
> > > +# Target-Install
> > > +# ----------------------------------------------------------------------------
> > > +
> > > +$(STATEDIR)/jimtcl.targetinstall:
> > > +	@$(call targetinfo)
> > > +
> > > +	@$(call install_init, jimtcl)
> > > +	@$(call install_fixup, jimtcl, PRIORITY, optional)
> > > +	@$(call install_fixup, jimtcl, SECTION, base)
> > > +	@$(call install_fixup, jimtcl, AUTHOR, "Ladislav Michl <ladis@linux-mips.org>")
> > > +	@$(call install_fixup, jimtcl, DESCRIPTION, \
> > > +		"A small footprint implementation of the Tcl programming language")
> > > +
> > > +ifdef PTXCONF_JIMTCL_SHELL
> > > +	@$(call install_copy, jimtcl, 0, 0, 0755, -, /usr/bin/jimsh)
> > > +ifdef PTXCONF_JIMTCL_SYMLINK
> > > +	@$(call install_link, jimtcl, jimsh, /usr/bin/tclsh)
> > > +endif
> > > +endif
> > > +	@$(call install_lib, jimtcl, 0, 0, 0644, libjim)
> > > +
> > > +	@$(call install_finish, jimtcl)
> > > +
> > > +	@$(call touch)
> > > +
> > > +# vim: syntax=make
> > > -- 
> > > 2.19.0
> > > 
> > > 
> > > _______________________________________________
> > > ptxdist mailing list
> > > ptxdist@pengutronix.de
> > 
> > -- 
> > Roland Hieber                     | r.hieber@pengutronix.de     |
> > Pengutronix e.K.                  | https://www.pengutronix.de/ |
> > Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
> > Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2 1/3] jimtcl: new package

[Ladislav Michl]

On Mon, Sep 17, 2018 at 10:21:29AM +0200, Michael Olbrich wrote:
> On Thu, Sep 13, 2018 at 12:38:47PM +0200, Ladislav Michl wrote:
> > On Thu, Sep 13, 2018 at 11:59:37AM +0200, Roland Hieber wrote:
> > > On Thu, Sep 13, 2018 at 10:32:26AM +0200, Ladislav Michl wrote:
> > > [...]
> > > > diff --git a/rules/jimtcl.make b/rules/jimtcl.make
> > > > new file mode 100644
> > > > index 000000000..16a5e2ae3
> > > > --- /dev/null
> > > > +++ b/rules/jimtcl.make
> > > > @@ -0,0 +1,77 @@
> > > > +# -*-makefile-*-
> > > > +#
> > > > +# Copyright (C) 2018 by Ladislav Michl <ladis@linux-mips.org>
> > > > +#
> > > > +# See CREDITS for details about who has contributed to this project.
> > > > +#
> > > > +# For further information about the PTXdist project and license conditions
> > > > +# see the README file.
> > > > +#
> > > > +
> > > > +#
> > > > +# We provide this package
> > > > +#
> > > > +PACKAGES-$(PTXCONF_JIMTCL) += jimtcl
> > > > +
> > > > +#
> > > > +# Paths and names
> > > > +#
> > > > +JIMTCL_VERSION	:= 0.78
> > > > +JIMTCL_MD5	:= bde9021d78a77fe28e1bbc423142ab23
> > > > +JIMTCL		:= jimtcl-$(JIMTCL_VERSION)
> > > > +JIMTCL_SUFFIX	:= tar.xz
> > > > +JIMTCL_URL	:= http://repo.or.cz/jimtcl.git;tag=$(JIMTCL_VERSION)
> > > > +JIMTCL_SOURCE	:= $(SRCDIR)/$(JIMTCL).$(JIMTCL_SUFFIX)
> > > > +JIMTCL_DIR	:= $(BUILDDIR)/$(JIMTCL)
> > > > +JIMTCL_LICENSE	:= BSD-2-Clause 
> > > > +
> > > > +# ----------------------------------------------------------------------------
> > > > +# Prepare
> > > > +# ----------------------------------------------------------------------------
> > > > +
> > > > +#
> > > > +# Package is not using autoconf but autosetup which is enough compatible...
> > > > +#
> > > > +JIMTCL_CONF_ENV		:= $(CROSS_ENV)
> > > > +JIMTCL_CONF_TOOL	:= autoconf
> > > > +JIMTCL_CONF_OPT		:= \
> > > > +	$(CROSS_AUTOCONF_USR) \
> > > > +	--shared
> > > 
> > > configure_helper.py shows a lot of options which are not present here.
> > > Did you take a look at them?
> > 
> > Yes. Those are related to commit log message :) As Tcl is in staging and
> > noone bothered I guess Tcl is not important to anyone and thus it does
> > not make sense to implement features noobody asks for. So jimtcl is here
> > only to make usb-nodeswitch happy which it does as it is.
> 
> It's not really autoconf, so you need to be careful which options are set,
> but there is stuff that is autodetected, so that needs explicit options.
> I think a lot of it is disabled by default, but at least lineedit and docs
> should imho be disabled.

("It's not really autoconf" is even stated in comment :)). I'll disable doc
and create option for lineedit and it is usefull when used as tcl
replacement.

> Also, this packages seems to use tclsh at configure and compile time. We
> need a host-system-tcl to make sure tclsh is installed. Check with
>
> type -P tclsh >/dev/null || ptxd_bailout "..."
> 
> I think.

Oh wait! I think we do not want to add more system dependencies.
We have host-jimtcl for that purpose, I just have to make sure that
bootstrapping works correctly as it first checks for system tcl
or compiles bootstrap one if not found. Or do you think it is better
to create host-system-tcl package?

> > > Also I noticed that Makefile.in sets
> > > 
> > >   CC = @CCACHE@ @CC@
> > >   CXX = @CCACHE@ @CXX@
> > > 
> > > which, in my case, becomes
> > > 
> > >   CC = ccache arm-v7a-linux-gnueabihf-gcc
> > >   CXX = ccache arm-v7a-linux-gnueabihf-g++
> > > 
> > > which is probably the reason why jimtcl.install fails because my ccache
> > > is not set up correctly (I did not enable it in ptxdist setup).
> > 
> > I did not enable it either. Which way does install fail in your case?
> 
> It fails if ccache is installed but does not work. Add 'CCACHE=none' to the
> CONF_ENV.
> 
> > > I'm not sure how using ccache can be avoided without patching the build
> > > system.
> > > 
> > > There is another error happening here in jimtcl.install, but i'm not
> > > sure if it is related to the faulty ccache usage:
> > > 
> > >   jim-readdir.c: In function 'Jim_ReaddirCmd':
> > >   jim-readdir.c:72:5: error: unknown type name 'DIR'
> > >        DIR *dirPtr;
> > >        ^~~
> > >   make[1]: *** [jim-readdir.o] Error 1
> > >   Makefile:65: recipe for target 'jim-readdir.o' failed
> > 
> > I do not see this message, care to investigate more? Thank you.
> 
> Roland: did you manually remove ccache from the Makefile, when this
> happens? Maybe your ccache issue broke the header detection and
> HAVE_DIRENT_H is not defined.
> 
> Michael
> 
> > >  - Roland
> > > 
> > > > +
> > > > +# ----------------------------------------------------------------------------
> > > > +# Install
> > > > +# ----------------------------------------------------------------------------
> > > > +
> > > > +$(STATEDIR)/jimtcl.install:
> > > > +	@$(call targetinfo)
> > > > +	@$(call world/install, JIMTCL)
> > > > +	@ln -sf libjim.so.$(JIMTCL_VERSION) $(JIMTCL_PKGDIR)/usr/lib/libjim.so
> > > > +	@$(call touch)
> > > > +
> > > > +# ----------------------------------------------------------------------------
> > > > +# Target-Install
> > > > +# ----------------------------------------------------------------------------
> > > > +
> > > > +$(STATEDIR)/jimtcl.targetinstall:
> > > > +	@$(call targetinfo)
> > > > +
> > > > +	@$(call install_init, jimtcl)
> > > > +	@$(call install_fixup, jimtcl, PRIORITY, optional)
> > > > +	@$(call install_fixup, jimtcl, SECTION, base)
> > > > +	@$(call install_fixup, jimtcl, AUTHOR, "Ladislav Michl <ladis@linux-mips.org>")
> > > > +	@$(call install_fixup, jimtcl, DESCRIPTION, \
> > > > +		"A small footprint implementation of the Tcl programming language")
> > > > +
> > > > +ifdef PTXCONF_JIMTCL_SHELL
> > > > +	@$(call install_copy, jimtcl, 0, 0, 0755, -, /usr/bin/jimsh)
> > > > +ifdef PTXCONF_JIMTCL_SYMLINK
> > > > +	@$(call install_link, jimtcl, jimsh, /usr/bin/tclsh)
> > > > +endif
> > > > +endif
> > > > +	@$(call install_lib, jimtcl, 0, 0, 0644, libjim)
> > > > +
> > > > +	@$(call install_finish, jimtcl)
> > > > +
> > > > +	@$(call touch)
> > > > +
> > > > +# vim: syntax=make
> > > > -- 
> > > > 2.19.0
> > > > 
> > > > 
> > > > _______________________________________________
> > > > ptxdist mailing list
> > > > ptxdist@pengutronix.de
> > > 
> > > -- 
> > > Roland Hieber                     | r.hieber@pengutronix.de     |
> > > Pengutronix e.K.                  | https://www.pengutronix.de/ |
> > > Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
> > > Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2 1/3] jimtcl: new package

[Michael Olbrich]

On Tue, Sep 18, 2018 at 09:04:40AM +0200, Ladislav Michl wrote:
> On Mon, Sep 17, 2018 at 10:21:29AM +0200, Michael Olbrich wrote:
> > On Thu, Sep 13, 2018 at 12:38:47PM +0200, Ladislav Michl wrote:
> > > On Thu, Sep 13, 2018 at 11:59:37AM +0200, Roland Hieber wrote:
> > > > On Thu, Sep 13, 2018 at 10:32:26AM +0200, Ladislav Michl wrote:
> > > > [...]
> > > > > diff --git a/rules/jimtcl.make b/rules/jimtcl.make
> > > > > new file mode 100644
> > > > > index 000000000..16a5e2ae3
> > > > > --- /dev/null
> > > > > +++ b/rules/jimtcl.make
> > > > > @@ -0,0 +1,77 @@
> > > > > +# -*-makefile-*-
> > > > > +#
> > > > > +# Copyright (C) 2018 by Ladislav Michl <ladis@linux-mips.org>
> > > > > +#
> > > > > +# See CREDITS for details about who has contributed to this project.
> > > > > +#
> > > > > +# For further information about the PTXdist project and license conditions
> > > > > +# see the README file.
> > > > > +#
> > > > > +
> > > > > +#
> > > > > +# We provide this package
> > > > > +#
> > > > > +PACKAGES-$(PTXCONF_JIMTCL) += jimtcl
> > > > > +
> > > > > +#
> > > > > +# Paths and names
> > > > > +#
> > > > > +JIMTCL_VERSION	:= 0.78
> > > > > +JIMTCL_MD5	:= bde9021d78a77fe28e1bbc423142ab23
> > > > > +JIMTCL		:= jimtcl-$(JIMTCL_VERSION)
> > > > > +JIMTCL_SUFFIX	:= tar.xz
> > > > > +JIMTCL_URL	:= http://repo.or.cz/jimtcl.git;tag=$(JIMTCL_VERSION)
> > > > > +JIMTCL_SOURCE	:= $(SRCDIR)/$(JIMTCL).$(JIMTCL_SUFFIX)
> > > > > +JIMTCL_DIR	:= $(BUILDDIR)/$(JIMTCL)
> > > > > +JIMTCL_LICENSE	:= BSD-2-Clause 
> > > > > +
> > > > > +# ----------------------------------------------------------------------------
> > > > > +# Prepare
> > > > > +# ----------------------------------------------------------------------------
> > > > > +
> > > > > +#
> > > > > +# Package is not using autoconf but autosetup which is enough compatible...
> > > > > +#
> > > > > +JIMTCL_CONF_ENV		:= $(CROSS_ENV)
> > > > > +JIMTCL_CONF_TOOL	:= autoconf
> > > > > +JIMTCL_CONF_OPT		:= \
> > > > > +	$(CROSS_AUTOCONF_USR) \
> > > > > +	--shared
> > > > 
> > > > configure_helper.py shows a lot of options which are not present here.
> > > > Did you take a look at them?
> > > 
> > > Yes. Those are related to commit log message :) As Tcl is in staging and
> > > noone bothered I guess Tcl is not important to anyone and thus it does
> > > not make sense to implement features noobody asks for. So jimtcl is here
> > > only to make usb-nodeswitch happy which it does as it is.
> > 
> > It's not really autoconf, so you need to be careful which options are set,
> > but there is stuff that is autodetected, so that needs explicit options.
> > I think a lot of it is disabled by default, but at least lineedit and docs
> > should imho be disabled.
> 
> ("It's not really autoconf" is even stated in comment :)). I'll disable doc
> and create option for lineedit and it is usefull when used as tcl
> replacement.

I just noticed, that lineedit only seems to need a header from glibc, so
maybe we can just always enable this. Can you verify that this works
without extra dependencies?

But an option for readline may be useful with the corresponding dependency
for libreadline, but I'm not sure how this works at runtime.

> > Also, this packages seems to use tclsh at configure and compile time. We
> > need a host-system-tcl to make sure tclsh is installed. Check with
> >
> > type -P tclsh >/dev/null || ptxd_bailout "..."
> > 
> > I think.
> 
> Oh wait! I think we do not want to add more system dependencies.
> We have host-jimtcl for that purpose, I just have to make sure that
> bootstrapping works correctly as it first checks for system tcl
> or compiles bootstrap one if not found. Or do you think it is better
> to create host-system-tcl package?

I didn't know that. I prefer bootstrapping. The package didn't take long to
build, so that won't be a problem.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de