diff options
| author | Romain Naour <romain.naour@gmail.com> | 2016-03-23 23:04:59 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-03-26 18:22:52 +0100 |
| commit | b33c4a2d4e5390d3d657d2afd8a9a275a5cf4185 (patch) | |
| tree | c9e7edb436720748ccdab86d309fb1478c30b4bb | |
| parent | 66471f0a589cbd778e9c0e7258ca092f0c2eb765 (diff) | |
| download | buildroot-b33c4a2d4e5390d3d657d2afd8a9a275a5cf4185.tar.gz buildroot-b33c4a2d4e5390d3d657d2afd8a9a275a5cf4185.zip | |
package/luajit: ensure dynamic library symlinks are created
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>
| -rw-r--r-- | package/luajit/luajit.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 322d2032f9..623bfcc5f7 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -72,7 +72,7 @@ define HOST_LUAJIT_BUILD_CMDS endef define HOST_LUAJIT_INSTALL_CMDS - $(MAKE) PREFIX="/usr" DESTDIR="$(HOST_DIR)" -C $(@D) install + $(MAKE) PREFIX="/usr" DESTDIR="$(HOST_DIR)" LDCONFIG=true -C $(@D) install endef $(eval $(generic-package)) |
