package/jimtcl: add host variant
PATCH 1/2 package/jimtcl: add host variant
host-jimtcl is needed for host-openocd
--- package/jimtcl/jimtcl.mk | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
package/jimtcl/jimtcl.mk +23 -0
@@ -78,4 +78,27 @@ define JIMTCL_INSTALL_TARGET_CMDS $(JIMTCL_LINK_TCLSH) endef +define HOST_JIMTCL_CONFIGURE_CMDS + (cd $(@D); \ + $(HOST_CONFIGURE_OPTS) \ + CCACHE=none \ + ./configure --prefix=$(HOST_DIR) \ + --shared \ + ) +endef + +define HOST_JIMTCL_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define HOST_JIMTCL_INSTALL_CMDS + for i in $(JIMTCL_HEADERS_TO_INSTALL); do \ + cp -a $(@D)/$$i $(HOST_DIR)/usr/include/ || exit 1 ; \ + done; + $(INSTALL) -m 0755 -D $(@D)/libjim.so.$(JIMTCL_VERSION) \ + $(HOST_DIR)/usr/lib/libjim.so.$(JIMTCL_VERSION) + ln -sf libjim.so.$(JIMTCL_VERSION) $(HOST_DIR)/usr/lib/libjim.so +endef + $(eval $(generic-package)) +$(eval $(host-generic-package))
Signature · 1 line
2.24.0
PATCH 2/2 package/openocd: use host-jimtcl for host variant
This will fix a build failure raised by commit 06aa2995350922197c6db0a46e39ac5c37d5a49e which dropped patch on embedded jimtcl
Fixes:
- http://autobuild.buildroot.org/results/bd140b5f433d4272f3efd43ff840e13e4301c4db
--- package/openocd/openocd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/openocd/openocd.mk +2 -2
@@ -97,12 +97,12 @@ HOST_OPENOCD_CONF_OPTS = \ --oldincludedir=$(HOST_DIR)/include \ --includedir=$(HOST_DIR)/include \ --disable-doxygen-html \ - --with-jim-shared=no \ + --disable-internal-jimtcl \ --disable-shared \ --enable-dummy \ --disable-werror -HOST_OPENOCD_DEPENDENCIES = host-libftdi host-libusb host-libusb-compat +HOST_OPENOCD_DEPENDENCIES = host-jimtcl host-libftdi host-libusb host-libusb-compat # Avoid documentation rebuild. On PowerPC64(le), we patch the # configure script. Due to this, the version.texi files gets
Signature · 1 line
2.24.0
Yann E. MORIN
AppliedPATCH 2/2 package/openocd: use host-jimtcl for host variant
Fabrice, All,
On 2019-12-22 15:02 +0100, Fabrice Fontaine spake thusly:
Quoted 8 lines
This will fix a build failure raised by commit
06aa2995350922197c6db0a46e39ac5c37d5a49ewhich dropped patch on embedded jimtclFixes:
- http://autobuild.buildroot.org/results/bd140b5f433d4272f3efd43ff840e13e4301c4dbSigned-off-by Fabrice Fontaine <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 30 lines
--- package/openocd/openocd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)package/openocd/openocd.mk +2
-2@@ -97,12 +97,12 @@ HOST_OPENOCD_CONF_OPTS = \ --oldincludedir=$(HOST_DIR)/include \ --includedir=$(HOST_DIR)/include \ --disable-doxygen-html \ - --with-jim-shared=no \ + --disable-internal-jimtcl \ --disable-shared \ --enable-dummy \ --disable-werror -HOST_OPENOCD_DEPENDENCIES = host-libftdi host-libusb host-libusb-compat +HOST_OPENOCD_DEPENDENCIES = host-jimtcl host-libftdi host-libusb host-libusb-compat # Avoid documentation rebuild. On PowerPC64(le), we patch the # configure script. Due to this, the version.texi files getsSignature · 6 lines
2.24.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Yann E. MORIN
AppliedPATCH 1/2 package/jimtcl: add host variant
In reply to Fabrice FontaineFabrice, All,
On 2019-12-22 15:02 +0100, Fabrice Fontaine spake thusly:
Quoted 3 lines
host-jimtcl is needed for host-openocd
Signed-off-by Fabrice Fontaine <[email protected]>
Applied to master, after:
- reformatting the build commands: spawning a sub-shell is useless,
and it's better to use '&&' to chain commands. I know you duplicated
the existing code, but better not to propagate the kinks from days
past;- adding the post-patch hook to update config.{guess,sub}
Thanks.
Regards,
Yann E. MORIN.
Quoted 43 lines
--- package/jimtcl/jimtcl.mk | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)package/jimtcl/jimtcl.mk +23
-0@@ -78,4 +78,27 @@ define JIMTCL_INSTALL_TARGET_CMDS $(JIMTCL_LINK_TCLSH) endef +define HOST_JIMTCL_CONFIGURE_CMDS + (cd $(@D); \ + $(HOST_CONFIGURE_OPTS) \ + CCACHE=none \ + ./configure --prefix=$(HOST_DIR) \ + --shared \ + ) +endef + +define HOST_JIMTCL_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define HOST_JIMTCL_INSTALL_CMDS + for i in $(JIMTCL_HEADERS_TO_INSTALL); do \ + cp -a $(@D)/$$i $(HOST_DIR)/usr/include/ || exit 1 ; \ + done; + $(INSTALL) -m 0755 -D $(@D)/libjim.so.$(JIMTCL_VERSION) \ + $(HOST_DIR)/usr/lib/libjim.so.$(JIMTCL_VERSION) + ln -sf libjim.so.$(JIMTCL_VERSION) $(HOST_DIR)/usr/lib/libjim.so +endef + $(eval $(generic-package)) +$(eval $(host-generic-package))Signature · 6 lines
2.24.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'