From 529f4c854cd478a8fcd3e63a4224ce29c0a2b73e Mon Sep 17 00:00:00 2001
From: "agentzh (Yichun Zhang)" <agentzh@gmail.com>
Date: Sat, 20 Apr 2013 23:10:26 -0700
Subject: [PATCH] always enable debuginfo in the bundled LuaJIT 2.0 build and
 Lua 5.1 build to support Nginx Systemtap Toolkit.

---
 patches/lua-5.1.5-enable_debug_info.patch | 11 +++++++++++
 util/configure                            |  4 ++--
 util/mirror-tarballs                      |  8 ++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 patches/lua-5.1.5-enable_debug_info.patch

diff --git a/patches/lua-5.1.5-enable_debug_info.patch b/patches/lua-5.1.5-enable_debug_info.patch
new file mode 100644
index 0000000..a1e4aa7
--- /dev/null
+++ b/patches/lua-5.1.5-enable_debug_info.patch
@@ -0,0 +1,11 @@
+--- lua-5.1.5/src/Makefile	2012-02-13 12:41:22.000000000 -0800
++++ lua-5.1.5-patched/src/Makefile	2013-04-20 22:56:42.921286886 -0700
+@@ -8,7 +8,7 @@
+ PLAT= none
+ 
+ CC= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
++CFLAGS= -g -O2 -Wall $(MYCFLAGS)
+ AR= ar rcu
+ RANLIB= ranlib
+ RM= rm -f
diff --git a/util/configure b/util/configure
index a61ea3f..b66cdab 100755
--- a/util/configure
+++ b/util/configure
@@ -512,12 +512,12 @@ _END_
 
         cd $luajit_src;
 
-        my $extra_opts = ' TARGET_STRIP=@:';
+        my $extra_opts = ' TARGET_STRIP=@: CCDEBUG=-g';
 
         if ($opts->{debug}) {
             $luajit_xcflags .= " -DLUA_USE_APICHECK -DLUA_USE_ASSERT";
             $luajit_xcflags =~ s/^ +//;
-            $extra_opts .= qq{ CCDEBUG=-g Q= XCFLAGS='$luajit_xcflags'};
+            $extra_opts .= qq{ Q= XCFLAGS='$luajit_xcflags'};
 
         } else {
             if ($luajit_xcflags) {
diff --git a/util/mirror-tarballs b/util/mirror-tarballs
index eaa1078..808975a 100755
--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@@ -324,14 +324,18 @@ tar -xzf lua-$ver.tar.gz || exit 1
 
 #rm "patch-lua-$ver-4" || exit 1
 
-echo "$info_txt applying the makefile_install_fix patch for lua 5.1"
+echo "$info_txt applying the makefile_install_fix patch for lua $ver"
 patch -p0 < $root/patches/lua-$ver-makefile_install_fix.patch || exit 1
 echo
 
-echo "$info_txt applying the disable_lua50_compat patch for lua 5.1"
+echo "$info_txt applying the disable_lua50_compat patch for lua $ver"
 patch -p0 < $root/patches/lua-$ver-disable_lua50_compat.patch || exit 1
 echo
 
+echo "$info_txt applying the enable_debug_info patch for lua $ver"
+patch -p0 < $root/patches/lua-$ver-enable_debug_info.patch || exit 1
+echo
+
 #################################
 
 ver=2.0.1