summaryrefslogtreecommitdiffstats
path: root/package/luajit/luajit.mk
Commit message (Collapse)AuthorAgeFilesLines
* luajit: fix host installationRomain Naour2016-05-011-2/+2
| | | | | | | | | | | | | | | | Packages installed for the host should have their prefix set to $(HOST_DIR)/usr, and therefore not use DESTDIR at installation time. Using PREFIX=/usr DESTDIR=$(HOST_DIR) is wrong, and leads for example to luajit.pc containing prefix=/usr, which means pkg-config returns incorrect results for host-luajit. This patch fixes the luajit package to conform to this rule. Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar> [Thomas: rewrite commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/luajit: ensure dynamic library symlinks are createdRomain Naour2016-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The luajit Makefile has the following logic: $(LDCONFIG) $(INSTALL_LIB) && \ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : So if ldconfig fails for some reason, the symbolic links to refer to the luajit library are not created. Since ldconfig for the target didn't make sense, LDCONFIG=true has been added a long time ago when building the target variant of luajit. However, since commit 9ba8d1cce4ab00307827083bae234d87b37fb967, the host variant of luajit is also linked dynamically. While ldconfig for the host should work, on certain machines ldconfig is not available in the PATH, and needs to be explicitly called as /sbin/ldconfig. However, since output/host/usr/lib is in the RPATH of the binaries we create, there is really no need to bother running ldconfig, so we simply pass LDCONFIG=true, like we do for the target variant. This ensures that the symlinks are always created. Fixes: http://autobuild.buildroot.net/results/4dc/4dcbcde0046e265317e170a977e699e5c3a06b87/ Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Francois Perrad <francois.perrad@gadz.org> [Thomas: rewrite commit log with a proper explanation.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/luajit: build host variant dynamicallyRomain Naour2016-03-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | While building libevas.so for the host-efl with luajit support, the link fail when libluajit is build statically: /usr/bin/ld: output/host/usr/lib/libluajit-5.1.a(ljamalg.o): relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC output/host/usr/lib/libluajit-5.1.a: error adding symbols: Bad value collect2: error: ld returned 1 exit status Build luajit dynamically in order to build host-efl with luajit support. Also, passing HOST_LDFLAGS is needed so that a proper rpath is added to the resulting binaries. Note that it is expected to have HOST_LDFLAGS assigned to TARGET_LDFLAGS, it's just that luajit has a somewhat non-conventional naming of variables. This is needed to avoid the following error from the rpath sanity check: *** *** ERROR: package host-luajit installs executables without proper RPATH: *** output/host/usr/bin/luajit Signed-off-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/luajit: bump to version 2.0.4Jörg Krause2015-05-211-1/+1
| | | | | Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: remove (non-)lfs dependencies and tweaksGustavo Zacarias2015-04-011-5/+0
| | | | | | | | Now that largefile is mandatory removes package dependencies and conditionals. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBSThomas Petazzoni2014-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed from "prefer static libraries when possible" to "use only static libraries". The former semantic didn't make much sense, since the user had absolutely no control/idea of which package would use static libraries, and which packages would not. Therefore, for quite some time, we have been starting to enforce that BR2_PREFER_STATIC_LIB should really build everything with static libraries. As a consequence, this patch renames BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS, and adjust the Config.in option accordingly. This also helps preparing the addition of other options to select shared, shared+static or just static. Note that we have verified that this commit can be reproduced by simply doing a global rename of BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* luajit: point /usr/bin/lua to luajit if lua not selectedDanomi Manchego2014-11-301-0/+5
| | | | | | | | | | The luajit package is a provider of a lua interpreter, but does not install a lua executable. This is fine for scripts that explicitly invoke luajit, but not so good for scripts that just need a lua interpreter and call lua. This mod creates a lua symlink so that the non-jit-specific scripts will still work. Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* .mk files: bulk aligment and whitespace cleanup of assignmentsThomas De Schampheleire2014-10-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* luajit: add host variantFrancois Perrad2014-07-271-0/+9
| | | | | | | | the goal is to use host-luajit with pkg-luarocks when luajit is on the selected luainterpreter for the target Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: make providers declare what they provideYann E. MORIN2014-05-211-0/+2
| | | | | | | | | | | | | | | Fixes: http://autobuild.buildroot.org/results/285/2851069d6964aa46d26b4aabe7d84e8c0c6c72ce http://autobuild.buildroot.net/results/9b7/9b7870354d70e27e42d3d9c1f131ab54706bf20e [...] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com> Cc: Arnout Vandecappelle <arnout@mind.be> Cc: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* luajit: bump to version 2.0.3Francois Perrad2014-03-121-1/+1
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* luajit: handles BR2_PREFER_STATIC_LIBFrancois Perrad2014-03-031-1/+7
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luajit: refactor without shared-lib.patchFrancois Perrad2014-03-031-0/+1
| | | | | | | the variable BUILDMODE does the job Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luajit: refactor without dont-strip.patchFrancois Perrad2014-03-031-1/+1
| | | | | | | the variable TARGET_STRIP does the job Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luajit: pass LDCONFIG=true to make sure dynamic library links are createdThomas Petazzoni2014-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To install its shared library, the luajit Makefile does: cd src && test -f $(FILE_SO) && \ $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ $(LDCONFIG) $(INSTALL_LIB) && \ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : This means that if ldconfig doesn't work or isn't available on the system, it won't create the libluajit-5.1.so -> libluajit-5.1.so.5.2.0 symbolic link. Not having this symbolic link prevents lua-ev from finding the shared version of the luajit library, and it fallbacks to using the libluajit.a static library. However, this static library is not built with -fPIC, so using it within a shared library doesn't work, and leads to build failures on architectures that really do want to have non-fPIC code into a shared library, such as x86-64. By passing LDCONFIG=true during the installation steps of luajit, we ensure that the symbolic links are created, which allows lua-ev to detect the shared library properly, making everybody happy. Investigation conducted with Samuel Martin. Thanks! Fixes: http://autobuild.buildroot.org/results/41c/41c8bb9cf91a86908a150dae27726136cb56f5b7/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* packages: remove package clean commandsThomas De Schampheleire2013-12-081-4/+0
| | | | | Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* packages: remove uninstall commandsThomas De Schampheleire2013-12-061-8/+0
| | | | | Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* Normalize separator size to 80Alexandre Belloni2013-06-061-2/+2
| | | | | Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* luajit: bump to version 2.0.2Francois Perrad2013-06-051-1/+1
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* luajit: bump to version 2.0.1Francois Perrad2013-02-221-1/+1
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* luajit: bump to version 2.0.0Francois Perrad2012-12-051-1/+1
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* luajit: bump to version 2.0.0-beta11Francois Perrad2012-10-211-6/+11
| | | | | | | this release includes my 2 requests, see http://www.freelists.org/post/luajit/LuaJIT-on-Buildroot Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* luajit: bug fix - prevent target CFLAGS from being used in host tool compile.Danomi Manchego2012-08-261-2/+2
| | | | | | | | | | | | | | The luajit amalgamation compile starts with building a host tool, and then uses it to build itself.  However, when CFLAGS is specified, as opposed to TARGET_CFLAGS, then it is used for both HOST and TARGET builds.  So if you add something target specific into 'Target Optimizations' (for example, '-mfpu=neon -mfloat-abi=softfp' for ARM Cortex-A8), then it gets into the host tool compile, which then fails (because my build machine is not an ARM Cortext-A8).  This can be fixed by using TARGET_CFLAGS and TARGET_LDFLAGS, instead of CFLAGS and LDFLAGS, respectively. Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luajit: add license infoFrancois Perrad2012-08-061-0/+2
| | | | | Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* luajit: new packageFrancois Perrad2012-07-181-0/+63
Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
OpenPOWER on IntegriCloud