rpms/premake
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix FTBFS with lua-5.2 (#1106672)

Browse Source
This commit is contained in:
Yaakov Selkowitz 2014-06-26 18:53:11 -05:00
parent abc14fe59a
commit 02cbf048c3
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
premake-4.3-system-lua.patch
View File

@ -5,13 +5,13 @@
TARGET = $(TARGETDIR)/premake4 TARGET = $(TARGETDIR)/premake4
DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
- INCLUDES += -I../../src/host/lua-5.1.4/src - INCLUDES += -I../../src/host/lua-5.1.4/src
+ INCLUDES += + INCLUDES += -I/usr/include/lua-5.1
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os
CXXFLAGS += $(CFLAGS) CXXFLAGS += $(CFLAGS)
LDFLAGS += -s -rdynamic LDFLAGS += -s -rdynamic
- LIBS += -lm -ldl - LIBS += -lm -ldl
+ LIBS += -lm -ldl -llua + LIBS += -lm -ldl -llua-5.1
RESFLAGS += $(DEFINES) $(INCLUDES) RESFLAGS += $(DEFINES) $(INCLUDES)
LDDEPS += LDDEPS +=
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
@ -20,13 +20,13 @@
TARGET = $(TARGETDIR)/premake4 TARGET = $(TARGETDIR)/premake4
DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
- INCLUDES += -I../../src/host/lua-5.1.4/src - INCLUDES += -I../../src/host/lua-5.1.4/src
+ INCLUDES += + INCLUDES += -I/usr/include/lua-5.1
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -g CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -g
CXXFLAGS += $(CFLAGS) CXXFLAGS += $(CFLAGS)
LDFLAGS += -rdynamic LDFLAGS += -rdynamic
- LIBS += -lm -ldl - LIBS += -lm -ldl
+ LIBS += -lm -ldl -llua + LIBS += -lm -ldl -llua-5.1
RESFLAGS += $(DEFINES) $(INCLUDES) RESFLAGS += $(DEFINES) $(INCLUDES)
LDDEPS += LDDEPS +=
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)

7
premake.spec
View File

@ -1,6 +1,6 @@
Name: premake Name: premake
Version: 4.3 Version: 4.3
Release: 8%{?dist} Release: 9%{?dist}
Summary: Cross-platform build configuration tool Summary: Cross-platform build configuration tool
Group: Development/Tools Group: Development/Tools
@ -12,7 +12,7 @@ Patch0: premake-4.3-system-lua.patch
# Add the missing manpage # Add the missing manpage
Patch1: premake-4.3-manpage.patch Patch1: premake-4.3-manpage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: lua-devel readline-devel BuildRequires: compat-lua-devel readline-devel
%description %description
Premake is a build configuration tool that can generate project files for: Premake is a build configuration tool that can generate project files for:
@ -56,6 +56,9 @@ rm -rf %{buildroot}
%changelog %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 * 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild