Attachment 912607 Details for Bug 1106672 – git format-patch

[patch] git format-patch

Fix-FTBFS-with-lua-52-1106672.patch (text/plain), 2.74 KB, created by Yaakov Selkowitz on 2014-06-26 23:56:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-26 23:56:54 UTC

Size: 2.74 KB

patch

obsolete

>From 02cbf048c3827a0cc2f6facd1be1a64db7ac5aaf Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Thu, 26 Jun 2014 18:53:11 -0500
>Subject: [PATCH] Fix FTBFS with lua-5.2 (#1106672)
>
>---
> premake-4.3-system-lua.patch | 8 ++++----
> premake.spec                 | 7 +++++--
> 2 files changed, 9 insertions(+), 6 deletions(-)
>
>diff --git a/premake-4.3-system-lua.patch b/premake-4.3-system-lua.patch
>index 7a47aaa..6a7a43f 100644
>--- a/premake-4.3-system-lua.patch
>+++ b/premake-4.3-system-lua.patch
>@@ -5,13 +5,13 @@
>    TARGET     = $(TARGETDIR)/premake4
>    DEFINES   += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
> -  INCLUDES  += -I../../src/host/lua-5.1.4/src
>-+  INCLUDES  += 
>++  INCLUDES  += -I/usr/include/lua-5.1
>    CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
>    CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -Os
>    CXXFLAGS  += $(CFLAGS) 
>    LDFLAGS   += -s -rdynamic
> -  LIBS      += -lm -ldl
>-+  LIBS      += -lm -ldl -llua
>++  LIBS      += -lm -ldl -llua-5.1
>    RESFLAGS  += $(DEFINES) $(INCLUDES) 
>    LDDEPS    += 
>    LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
>@@ -20,13 +20,13 @@
>    TARGET     = $(TARGETDIR)/premake4
>    DEFINES   += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
> -  INCLUDES  += -I../../src/host/lua-5.1.4/src
>-+  INCLUDES  += 
>++  INCLUDES  += -I/usr/include/lua-5.1
>    CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
>    CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g
>    CXXFLAGS  += $(CFLAGS) 
>    LDFLAGS   += -rdynamic
> -  LIBS      += -lm -ldl
>-+  LIBS      += -lm -ldl -llua
>++  LIBS      += -lm -ldl -llua-5.1
>    RESFLAGS  += $(DEFINES) $(INCLUDES) 
>    LDDEPS    += 
>    LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
>diff --git a/premake.spec b/premake.spec
>index 52f9e09..1f60610 100644
>--- a/premake.spec
>+++ b/premake.spec
>@@ -1,6 +1,6 @@
> Name:           premake
> Version:        4.3
>-Release:        8%{?dist}
>+Release:        9%{?dist}
> Summary:        Cross-platform build configuration tool
> 
> Group:          Development/Tools
>@@ -12,7 +12,7 @@ Patch0:         premake-4.3-system-lua.patch
> # Add the missing manpage
> Patch1:         premake-4.3-manpage.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-BuildRequires:  lua-devel readline-devel
>+BuildRequires:  compat-lua-devel readline-devel
> 
> %description
> Premake is a build configuration tool that can generate project files for:
>@@ -56,6 +56,9 @@ rm -rf %{buildroot}
> 
> 
> %changelog
>+* Thu Jun 26 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 4.3-9
>+- Fix FTBFS with lua-5.2 (#1106672)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3-8
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3

Actions: View | Diff

Attachments on bug 1106672: 904979 | 904980 | 904981 | 907484 | 912607