Use system luajit or liblua

Gbp-Pq: Name 0004-force-use-luajit-system-lib.patch

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4c522791cd4516b06c6b2d5bf224c4f7f854b0e6..45055da87f370239863b4b019250d2180728d6d5 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,32 +25,3 @@ endif
 if BUILD_WCCP
 SUBDIRS += wccp
 endif
-
-# Support verbose LuaJIT builds with "make V=1".
-luajit__v_ = $(luajit__v_$(AM_DEFAULT_VERBOSITY))
-luajit__v_0 = @
-luajit__v_1 =
-
-# Some special hacks around building the luajit.
-#
-#  - Copy the luajit source tree if we're doing out-of-source builds
-#  - Upon clean, remove the luajit tree from the out-of-source build tree
-#
-# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs
-#       the -m64 flag. See configure.ac.
-#
-all-local:
-       @echo "Making all in luajit"
-       test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
-       cd luajit && $(MAKE) $(AM_MAKEFLAGS) \
-               BUILDMODE="static" \
-               PREFIX="$(prefix)" \
-               CC="$(CC)" \
-               CFLAGS="$(LUAJIT_CFLAGS)" \
-               XCFLAGS="" \
-               LDFLAGS="$(LUAJIT_LDFLAGS)" \
-               Q=$(luajit__v_$(V))
-
-clean-local:
-       test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean)
-       test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit"

diff --git a/lib/Makefile.in b/lib/Makefile.in
index b6369534f9121d8d8d46a39f95960204bac9d82f..cc6607a65f7f8837ca7226fd1c305f8bc4b244e0 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -305,9 +305,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -912,29 +912,6 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-# Some special hacks around building the luajit.
-#
-#  - Copy the luajit source tree if we're doing out-of-source builds
-#  - Upon clean, remove the luajit tree from the out-of-source build tree
-#
-# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs
-#       the -m64 flag. See configure.ac.
-#
-all-local:
-       @echo "Making all in luajit"
-       test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
-       cd luajit && $(MAKE) $(AM_MAKEFLAGS) \
-               BUILDMODE="static" \
-               PREFIX="$(prefix)" \
-               CC="$(CC)" \
-               CFLAGS="$(LUAJIT_CFLAGS)" \
-               XCFLAGS="" \
-               LDFLAGS="$(LUAJIT_LDFLAGS)" \
-               Q=$(luajit__v_$(V))
-
-clean-local:
-       test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean)
-       test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit"
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/lib/bindings/Makefile.am b/lib/bindings/Makefile.am
index b4a4737cec5f830d5e3e563b8fab9f1226b0af32..b4a320fa7ac7be7ebdebdf0dcec1b17447daf41d 100644 (file)
--- a/lib/bindings/Makefile.am
+++ b/lib/bindings/Makefile.am
@@ -19,9 +19,10 @@
 include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS += \
-  $(LUAJIT_CPPFLAGS) \
+  $(LUA_CPPFLAGS) \
   -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records
+  -I$(abs_top_srcdir)/lib/records \
+  $(LUA_CPPFLAGS)
 
 noinst_LTLIBRARIES = libbindings.la
 

diff --git a/lib/bindings/Makefile.in b/lib/bindings/Makefile.in
index 58253812fce7260eaaba21b36d1d600cfeb5dfeb..e0be05a77928494e6f4ad14109a2f585f6a68b81 100644 (file)
--- a/lib/bindings/Makefile.in
+++ b/lib/bindings/Makefile.in
@@ -243,7 +243,7 @@ pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ $(LUAJIT_CPPFLAGS) -I$(abs_top_srcdir)/lib \
+AM_CPPFLAGS = @AM_CPPFLAGS@ $(LUA_CPPFLAGS) -I$(abs_top_srcdir)/lib \
        -I$(abs_top_srcdir)/lib/records
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -327,9 +327,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/perl/Makefile.in b/lib/perl/Makefile.in
index ada6e685ee469d7bb8a0376aea06962ba1a92287..826d6204102bfbf48018d55f05bf67640b49d638 100644 (file)
--- a/lib/perl/Makefile.in
+++ b/lib/perl/Makefile.in
@@ -242,9 +242,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/records/Makefile.in b/lib/records/Makefile.in
index e964ad2c9b17a5339a462f1352e33a38a0560821..ba15f3e7c85a478a5f0afc2753f7efbc10187978 100644 (file)
--- a/lib/records/Makefile.in
+++ b/lib/records/Makefile.in
@@ -350,9 +350,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/ts/Makefile.in b/lib/ts/Makefile.in
index 4adfdb719e176af5f9892924f2449977de4e4f86..e32bd3ceb90ba1dba4fdbacf1c0a87bcca0e3436 100644 (file)
--- a/lib/ts/Makefile.in
+++ b/lib/ts/Makefile.in
@@ -622,9 +622,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/tsconfig/Makefile.in b/lib/tsconfig/Makefile.in
index 70f34690bcc672eca5498e132bef4a7026a23c3a..9dee2be82b1e707d29035e3ca8ac63cd9396c1b7 100644 (file)
--- a/lib/tsconfig/Makefile.in
+++ b/lib/tsconfig/Makefile.in
@@ -399,9 +399,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/wccp/Makefile.in b/lib/wccp/Makefile.in
index 6c46f03c355101952bd13ef9382464eeac10dd5c..44251c120730ae2af3406e1fcbd4354f4bc3f6f3 100644 (file)
--- a/lib/wccp/Makefile.in
+++ b/lib/wccp/Makefile.in
@@ -335,9 +335,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@