Compare commits

..

No commits in common. "master" and "f18" have entirely different histories.
master ... f18

2 changed files with 16 additions and 59 deletions

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 += -I/usr/include/lua-5.1 + INCLUDES +=
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-5.1 + LIBS += -lm -ldl -llua
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 += -I/usr/include/lua-5.1 + INCLUDES +=
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-5.1 + LIBS += -lm -ldl -llua
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)

View File

@ -1,8 +1,9 @@
Name: premake Name: premake
Version: 4.3 Version: 4.3
Release: 20%{?dist} Release: 5%{?dist}
Summary: Cross-platform build configuration tool Summary: Cross-platform build configuration tool
Group: Development/Tools
License: BSD License: BSD
URL: http://industriousone.com/premake URL: http://industriousone.com/premake
Source0: http://downloads.sourceforge.net/%{name}/premake-%{version}-src.zip Source0: http://downloads.sourceforge.net/%{name}/premake-%{version}-src.zip
@ -10,8 +11,8 @@ Source0: http://downloads.sourceforge.net/%{name}/premake-%{version}-src.
Patch0: premake-4.3-system-lua.patch 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
BuildRequires: gcc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: compat-lua-devel readline-devel BuildRequires: 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:
@ -28,9 +29,9 @@ Premake is a build configuration tool that can generate project files for:
%patch0 -p0 %patch0 -p0
%patch1 -p0 %patch1 -p0
# Inject optflags into CFLAGS # Inject optflags into CFLAGS
sed -i "s|^\s*CFLAGS\s*+=.*|CFLAGS += \$(CPPFLAGS) %{optflags}|" build/gmake.unix/Premake4.make sed -i "s/^\s*CFLAGS\s*+=.*/CFLAGS += \$(CPPFLAGS) %{optflags}/" build/gmake.unix/Premake4.make
# Disable stripping the executable # Disable stripping the executable
sed -i "s|^\s*LDFLAGS\s*+= -s|LDFLAGS +=|" build/gmake.unix/Premake4.make sed -i "s/^\s*LDFLAGS\s*+= -s/LDFLAGS +=/" build/gmake.unix/Premake4.make
# Use the release build for running tests # Use the release build for running tests
sed -i "s/debug/release/" tests/test sed -i "s/debug/release/" tests/test
@ -39,66 +40,22 @@ cd build/gmake.unix/
make verbose=true %{?_smp_mflags} make verbose=true %{?_smp_mflags}
%install %install
rm -rf %{buildroot}
install -m 755 -Dp ./bin/release/premake4 %{buildroot}/%{_bindir}/premake4 install -m 755 -Dp ./bin/release/premake4 %{buildroot}/%{_bindir}/premake4
install -m 644 -Dp ./premake4.1 %{buildroot}/%{_mandir}/man1/premake4.1 install -m 644 -Dp ./premake4.1 %{buildroot}/%{_mandir}/man1/premake4.1
%clean
rm -rf %{buildroot}
%files %files
%defattr(-,root,root,-)
%{_bindir}/premake4 %{_bindir}/premake4
%{_mandir}/man1/premake4.1* %{_mandir}/man1/premake4.1*
%doc README.txt CHANGES.txt %doc LICENSE.txt README.txt CHANGES.txt
%license LICENSE.txt
%changelog %changelog
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sat Jun 20 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 4.3-12
- Use '|' instead of '/' as pattern delimiter in sed expression to filter
CFLAGS (Fix FTBFS).
- Modernize spec.
- Add %%license.
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* 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
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3-5 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild