patches/lua-5.3.4_pre.local.patch: deduplicate (via Son_Goku.)

1 files changed, 15 insertions, 167 deletions

diff --git a/patches/lua-5.3.4_pre.local.patch b/patches/lua-5.3.4_pre.local.patch
index cbc41bb7..49f4c723 100644
--- a/patches/lua-5.3.4_pre.local.patch
+++ b/patches/lua-5.3.4_pre.local.patch
@@ -1,4 +1,4 @@
-From c13b3e5466ab1ced0f78bdc83aec77b4fef0b5e4 Mon Sep 17 00:00:00 2001
+From 8a848c7ada873efa2b0878cee7f6871478fb47e5 Mon Sep 17 00:00:00 2001
 From: Neal Gompa <ngompa13@gmail.com>
 Date: Sat, 28 Apr 2018 09:22:35 -0400
 Subject: [PATCH] Autotoolize Lua 5.3.4
@@ -25,14 +25,14 @@ Cf. https://src.fedoraproject.org/rpms/lua/blob/ed24e54f3b10a67e141af985ff63b493
 Before bumping Lua, check to see if the Fedora patch set for autotoolizing
 has changed and use those to rebase this super-patch.
 ---
- Makefile.am                              |   9 +
- configure.ac                             | 226 +++++++++++++++++++++++
- doc/Makefile.am                          |  12 ++
- src/.gitignore                           |  15 ++
- src/Makefile.am                          |  46 +++++
- src/lua.pc.in                            |  13 ++
- src/{luaconf.h => luaconf.h.template.in} |  14 +-
- 7 files changed, 331 insertions(+), 4 deletions(-)
+ Makefile.am                              |  3 +
+ configure.ac                             | 88 ++++++++++++++++++++++++
+ doc/Makefile.am                          |  4 ++
+ src/.gitignore                           | 15 ++++
+ src/Makefile.am                          | 46 +++++++++++++
+ src/lua.pc.in                            | 13 ++++
+ src/{luaconf.h => luaconf.h.template.in} | 14 ++--
+ 7 files changed, 179 insertions(+), 4 deletions(-)
  create mode 100644 Makefile.am
  create mode 100644 configure.ac
  create mode 100644 doc/Makefile.am
@@ -43,25 +43,19 @@ has changed and use those to rebase this super-patch.
 
 diff --git a/Makefile.am b/Makefile.am
 new file mode 100644
-index 0000000..ca86fd2
+index 0000000..8d968c4
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,9 @@
-+SUBDIRS = src doc
-+
-+EXTRA_DIST = README
-+SUBDIRS = src doc
-+
-+EXTRA_DIST = README
+@@ -0,0 +1,3 @@
 +SUBDIRS = src doc
 +
 +EXTRA_DIST = README
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
-index 0000000..53d0140
+index 0000000..61c4dcd
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,226 @@
+@@ -0,0 +1,88 @@
 +AC_PREREQ(2.59)
 +AC_INIT([lua], [5.3.4], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
 +AC_SUBST([MAJOR_VERSION], [5.3])
@@ -150,158 +144,12 @@ index 0000000..53d0140
 +                 doc/Makefile
 +])
 +AC_OUTPUT
-+AC_PREREQ(2.59)
-+AC_INIT([lua], [5.3.4], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
-+AC_SUBST([MAJOR_VERSION], [5.3])
-+
-+AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_SRCDIR([src/lapi.c])
-+
-+AM_INIT_AUTOMAKE([1.9 foreign])
-+
-+AC_PROG_CC
-+AC_PROG_LIBTOOL
-+
-+AC_ARG_WITH(
-+  [readline],
-+  [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
-+  [use_readline=$withval],
-+  [use_readline=yes]
-+)
-+
-+LUA_LIBS="-lm"
-+
-+# Check for readline
-+READLINE_DEFS="#undef LUA_USE_READLINE"
-+if test "x$use_readline" == "xyes"; then
-+  AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
-+  AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
-+  if test "x$use_readline" == "xno"; then
-+    AC_MSG_WARN([readline headers could not be found, disabling readline support])
-+  else
-+    READLINE_DEFS="#define LUA_USE_READLINE"
-+    READLINE_LIBS="-lreadline -lncurses"
-+  fi
-+fi
-+AC_SUBST(READLINE_DEFS)
-+AC_SUBST(READLINE_LIBS)
-+
-+case "$host" in
-+  *-mingw*)  use_os=win32  ;;
-+  *-darwin*) use_os=macosx ;;
-+  *)         use_os=posix  ;;
-+esac
-+
-+POSIX_DEFS="#undef LUA_USE_POSIX"
-+LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
-+LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
-+
-+if test "x$use_os" == "xwin32"; then
-+  LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
-+elif test "x$use_os" == "xmacosx"; then
-+  POSIX_DEFS="#define LUA_USE_POSIX"
-+  LUA_DL_DEFS="#define LUA_DL_DYLD"
-+elif test "x$use_os" == "xposix"; then
-+  POSIX_DEFS="#define LUA_USE_POSIX"
-+  LUA_DL_DEFS="#define LUA_DL_DLOPEN"
-+  LUA_LIBS="$LUA_LIBS -ldl"
-+fi
-+AC_SUBST(POSIX_DEFS)
-+AC_SUBST(LUA_DL_DEFS)
-+AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
-+
-+AC_SUBST(LUA_LIBS)
-+
-+AC_CONFIG_FILES([Makefile
-+                 src/Makefile
-+                 src/lua.pc
-+                 src/luaconf.h.template
-+                 doc/Makefile
-+])
-+AC_OUTPUT
-+AC_PREREQ(2.59)
-+AC_INIT([lua], [5.3.4], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
-+AC_SUBST([MAJOR_VERSION], [5.3])
-+
-+AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_SRCDIR([src/lapi.c])
-+
-+AM_INIT_AUTOMAKE([1.9 foreign])
-+
-+AC_PROG_CC
-+AC_PROG_LIBTOOL
-+
-+AC_ARG_WITH(
-+  [readline],
-+  [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
-+  [use_readline=$withval],
-+  [use_readline=yes]
-+)
-+
-+LUA_LIBS="-lm"
-+
-+# Check for readline
-+READLINE_DEFS="#undef LUA_USE_READLINE"
-+if test "x$use_readline" == "xyes"; then
-+  AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
-+  AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
-+  if test "x$use_readline" == "xno"; then
-+    AC_MSG_WARN([readline headers could not be found, disabling readline support])
-+  else
-+    READLINE_DEFS="#define LUA_USE_READLINE"
-+    READLINE_LIBS="-lreadline -lncurses"
-+  fi
-+fi
-+AC_SUBST(READLINE_DEFS)
-+AC_SUBST(READLINE_LIBS)
-+
-+case "$host" in
-+  *-mingw*)  use_os=win32  ;;
-+  *-darwin*) use_os=macosx ;;
-+  *)         use_os=posix  ;;
-+esac
-+
-+POSIX_DEFS="#undef LUA_USE_POSIX"
-+LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
-+LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
-+
-+if test "x$use_os" == "xwin32"; then
-+  LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
-+elif test "x$use_os" == "xmacosx"; then
-+  POSIX_DEFS="#define LUA_USE_POSIX"
-+  LUA_DL_DEFS="#define LUA_DL_DYLD"
-+elif test "x$use_os" == "xposix"; then
-+  POSIX_DEFS="#define LUA_USE_POSIX"
-+  LUA_DL_DEFS="#define LUA_DL_DLOPEN"
-+  LUA_LIBS="$LUA_LIBS -ldl"
-+fi
-+AC_SUBST(POSIX_DEFS)
-+AC_SUBST(LUA_DL_DEFS)
-+AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
-+
-+AC_SUBST(LUA_LIBS)
-+
-+AC_CONFIG_FILES([Makefile
-+                 src/Makefile
-+                 src/lua.pc
-+                 src/luaconf.h.template
-+                 doc/Makefile
-+])
-+AC_OUTPUT
 diff --git a/doc/Makefile.am b/doc/Makefile.am
 new file mode 100644
-index 0000000..9a72205
+index 0000000..3705696
 --- /dev/null
 +++ b/doc/Makefile.am
-@@ -0,0 +1,12 @@
-+man1_MANS = lua.1 luac.1
-+
-+EXTRA_DIST = \
-+	contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
-+man1_MANS = lua.1 luac.1
-+
-+EXTRA_DIST = \
-+	contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
+@@ -0,0 +1,4 @@
 +man1_MANS = lua.1 luac.1
 +
 +EXTRA_DIST = \