summaryrefslogtreecommitdiffstats
path: root/package/luarocks
Commit message (Collapse)AuthorAgeFilesLines
* package/luarocks: refactor buildroot addon without patchFrancois Perrad2019-02-063-361/+332
| | | | | | | | | | addon commands are actually implemented in luarocks 3.0.4, and they must be located in luarocks/cmd/external. so, it is useless to patch luarocks. Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/luarocks: fix generation of license file list in Buildroot addonFrancois Perrad2019-01-011-1/+1
| | | | | | | check-package requires an hardtab instead of 4 spaces. Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/luarocks: add buildroot addonFrancois Perrad2018-12-311-0/+361
| | | | | | | | This addon allows to generate a Buildroot package from a Luarocks package definition. Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/luarocks: rework configuration file for per-package directoriesThomas Petazzoni2018-12-012-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | Currently, luarocks.mk generates a configuration file with hardcoded STAGING_DIR, TARGET_DIR, TARGET_CC, LUAROCKS_CFLAGS and TARGET_LDFLAGS values. This is not compatible with per-package directories, where the value of STAGING_DIR, TARGET_DIR, TARGET_CC and possibly TARGET_CFLAGS/TARGET_LDFLAGS may be different from one package to the other. Based on input from François Perrad, this commit: - Changes the Luarocks configuration file to use os_getenv() for the appropriate variables. Since the contents of this file is not fixed, it is no longer generated by luarocks.mk using a series of 'echo' but simply concatenated with the rest of the Luarocks configuration file. - Adjusts LUAROCKS_RUNV_ENV so that the necessary environment variables are now passed. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Acked-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* luarocks: bump to version 3.0.4Francois Perrad2018-10-312-2/+2
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* luarocks: bump to version 3.0.3Francois Perrad2018-09-162-2/+2
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* luarocks: add hash for license fileThomas Petazzoni2018-09-081-0/+1
| | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* luarocks: bump to version 3.0.2Francois Perrad2018-09-082-4/+2
| | | | | | | (remove 2 unused variables) Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* luarocks: bump to version 3.0.1Francois Perrad2018-08-163-5/+7
| | | | | | | | | The meaning of --sysconfdir has changed (see announcement http://lua-users.org/lists/lua-l/2018-08/msg00101.html), So, LUAROCKS_CONFIG_DIR & LUAROCKS_CONFIG_FILE are adjusted. Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* luarocks: fix lua modules building with luajitFrancois Perrad2018-08-051-0/+32
| | | | | | | | | | | currently, when luajit is selected as luainterpreter, all lua module fails to build with the message: Error: Failed finding Lua library. You may need to configure LUA_LIBDIR. see http://autobuild.buildroot.net/results/66de049c306d7aff66894d53e2f4fa755fd01594 Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* luarocks: bump to version 3.0.0Francois Perrad2018-07-252-18/+17
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* lua: always use host-lua for host-luainterpreterPeter Korsgaard2018-03-311-4/+0
| | | | | | | | | | | | | | | | | | Similar to how we do for openssl. host-luainterpreter is only used by the luarocks infrastructure, and there is afaik no specific reason why the host lua variant must match the target one. Luajit only supports a limited number of architectures, so building it for the host limits the architectures Buildroot can be used on (E.G. powerpc64 autobuilders). To fix this, always use host-lua. Slightly rework lua.mk to ensure host-lua-5.1 is used when luajit is selected, and drop the logic for using host-luajit. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* luarocks: bump to version 2.4.4Francois Perrad2018-03-132-2/+2
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* luarocks: bump to version 2.4.3Francois Perrad2017-09-132-2/+2
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* Globally replace $(HOST_DIR)/usr with $(HOST_DIR)Arnout Vandecappelle2017-07-051-2/+2
| | | | | | | | | | | Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '\$(HOST_DIR)/usr' | xargs sed -i 's%\$(HOST_DIR)/usr%$(HOST_DIR)%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* Globally replace $(HOST_DIR)/usr/share with $(HOST_DIR)/shareArnout Vandecappelle2017-07-051-1/+1
| | | | | | | | | | | Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '$(HOST_DIR)/usr/share' | xargs sed -i 's%$(HOST_DIR)/usr/share%$(HOST_DIR)/share%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* Globally replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/binArnout Vandecappelle2017-07-051-1/+1
| | | | | | | | | | | Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '$(HOST_DIR)/usr/bin' | xargs sed -i 's%$(HOST_DIR)/usr/bin%$(HOST_DIR)/bin%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* generic packages: use $(HOST_DIR) instead of $(HOST_DIR)/usr as prefixArnout Vandecappelle2017-07-051-2/+2
| | | | | | | | | | | | Remove the redundant usr/ component of the HOST_DIR paths. Since a previous commit added a symlink from $(HOST_DIR)/usr to $(HOST_DIR), everything keeps on working. This is a mechanical change with git grep -l '\$(HOST_DIR)/usr' | xargs sed -i 's%\(prefix\|PREFIX\)=\("\?\)\$(HOST_DIR)/usr%\1=\2$(HOST_DIR)%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: fix target-finalize hook processingDanomi Manchego2016-12-281-1/+4
| | | | | | | | | | | | | | | The LUAROCKS_TARGET_FINALIZE_HOOKS is not running, so detritus is being left in /usr/lib/luarocks. This is because host-luarocks is built by being a dependency in the luarocks package infrastructure, not by being selected by kconfig symbol. This means that the $(PKG)_KCONFIG_VAR in pkg-generic.mk is not met, and (HOST_)LUAROCKS_TARGET_FINALIZE_HOOKS is not added to the global TARGET_FINALIZE_HOOKS. This mod fixes this issue by adding the host-luarocks hook directly to TARGET_FINALIZE_HOOKS when either lua or luajit is enabled. Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* luarocks: bump to version 2.4.2Francois Perrad2016-11-302-2/+2
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: bump to version 2.4.1Francois Perrad2016-10-072-2/+2
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: bump to version 2.4.0Francois Perrad2016-09-092-2/+2
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* packages: use the <PKG>_TARGET_FINALIZE_HOOKSYann E. MORIN2016-07-051-2/+1
| | | | | | | | | | | | | | | | | | Register package-specific target-finalize hooks with the newly-introduced <PKG>_TARGET_FINALIZE_HOOKS. This incidentally fixes luarocks, which was registering target-finalize hooks even when it was not enabled. To be noted, the skeleton package is not converted, because it is not optional, we always have it; so its hooks would always be registered anyway. Besides, the followup patches would render this conversion moot anyway, since those hooks would be spread across the various skeleton packages. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: bump to version 2.3.0Francois Perrad2016-01-122-1/+3
| | | | | | [Peter: add .hash file] Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* pkg-luarocks: fix top-level parallel makefile supportFabio Porcedda2015-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | In the *-install-target phase the manifest file is being updated, if multiply packages try to update it they fail. To avoid multiple access to the manifest file use flock to sync multiple luarocks packages. e.g. installing three luarocks packages: make lua-cjson-build lua-coat-build lua-coatpersistent-build make lua-cjson lua-coat lua-coatpersistent -j Fix error: Updating manifest for /home/tetsuya/buildroot/br2/output/target/usr/lib/luarocks/rocks No existing manifest. Attempting to rebuild... Error: rock_manifest file not found for lua-coat 0.9.1-1 - not a LuaRocks 2 tree? [Thomas: get rid of LUAROCKS_RUN, and use LUAROCKS_RUN_ENV + LUAROCKS_RUN_CMD everywhere.] Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: bump to version 2.2.2Francois Perrad2015-04-251-1/+1
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: indentation cleanupJerzy Grzegorek2015-03-311-1/+1
| | | | | | | This commit doesn't touch infra packages. Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: bump to version 2.2.1Francois Perrad2015-03-171-1/+1
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* lua: add 5.3.x serieFrancois Perrad2015-02-021-1/+5
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* .mk files: bulk aligment and whitespace cleanup of assignmentsThomas De Schampheleire2014-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* packages: rename FOO_CONF_OPT into FOO_CONF_OPTSThomas De Schampheleire2014-10-041-3/+3
| | | | | | | | | | | | To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: bump to version 2.2.0Francois Perrad2014-09-061-1/+1
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package: remove the trailing slash sign from <PKG>_SITE variableJerzy Grzegorek2014-07-311-1/+1
| | | | | | | | | | | | Since the trailing slash is stripped from $($(PKG)_SITE) by pkg-generic.mk: $(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE)) so it is redundant. This patch removes it from $(PKG)_SITE variable for BR consistency. Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: refactor with TARGET_FINALIZE_HOOKSFrancois Perrad2014-07-291-0/+7
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: allow to work with host-luainterpreterFrancois Perrad2014-07-271-6/+12
| | | | | | | | | when we embed luajit on target, we use luarocks with host-luajit instead of host-lua, in order to use the same interpreter on the both side. Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: move the option --deps-modeFrancois Perrad2014-07-261-0/+1
| | | | | | | | | | The option moves from `luarocks make` command to the LuaRocks config file. This change and the merge of PR https://github.com/keplerproject/luarocks/pull/236 in LuaRocks 2.2.0 avoids the confusing message "Missing dependency" Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: bump to version 2.2.0beta1Francois Perrad2014-07-261-1/+1
| | | | | | | this version includes a new default repository for rocks Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: remove luainterpreter dependencyFrancois Perrad2014-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | All packages using the luarocks infrastructure need a dependency on luainterpreter, because having the Lua interpreter for the target is needed to built native Lua modules. This dependency is already taken care of in pkg-luarocks.mk. However, host-luarocks, which is built as a dependency of the extract step of any luarocks package, also had a dependency on luainterpreter. Not only this was not necessary, but it was causing problems with 'make legal-info'. Since 'make legal-info' triggers the extraction of all packages, as soon as a luarocks package was enabled, it would trigger the build of host-luarocks, itself triggering the build of luainterpreter and therefore its dependencies, amongst which the entire cross-compilation toolchain. [Thomas: reword commit log to include more detailed explanations.] Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luarocks: never wraps scriptFrancois Perrad2014-02-261-0/+1
| | | | | | | this config prevents the introduction of some HOST_DIR paths on target Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* lua-modules: choice between Lua 5.1.x & Lua 5.2.xFrancois Perrad2014-01-211-2/+2
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* luarocks: use -fPIC for shared libraryFrancois Perrad2014-01-151-1/+1
| | | | | | | | | | | | | Fixes: http://autobuild.buildroot.net/results/f28a624f89f4de249a1b7a718f5ae31109ba9171/ http://autobuild.buildroot.net/results/1ead0a162a251d3e7bf8598036fa06c4befeb3d9/ http://autobuild.buildroot.net/results/0544cead086ba51b45dfa1df114787a8f22eaf8d/ http://autobuild.buildroot.net/results/60161d13d596d41dd4059977eb947d72c172f0d5/ http://autobuild.buildroot.net/results/e7e/e7ea6946552f72dc27f23ae1aff1665a6aa097c7/ [Peter: adjust commit message] Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* luarocks: new infrastructureFrancois Perrad2014-01-131-0/+3
| | | | | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [yann.morin.1998@free.fr: apply Thomas' comments] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* luarocks: new packageFrancois Perrad2014-01-131-0/+42
Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [yann.morin.1998@free.fr: apply Thomas' suggestions] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
OpenPOWER on IntegriCloud