Attachment 875830 Details for Bug 1077533 – Use system lua instead of bundled one

[patch] Use system lua instead of bundled one

Use-system-lua-instead-of-bundled-one.patch (text/plain), 3.01 KB, created by Ville Skyttä on 2014-03-18 08:17:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-18 08:17:53 UTC

Size: 3.01 KB

patch

obsolete

>From ed2beadb982f11e64a988de3268adabb81a6978b Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Tue, 18 Mar 2014 10:16:08 +0200
>Subject: [PATCH] Use system lua instead of bundled one
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1077533
>---
> bam-0.4.0-system-lua.patch | 18 ++++++++++++++++++
> bam.spec                   | 14 +++++++++++++-
> 2 files changed, 31 insertions(+), 1 deletion(-)
> create mode 100644 bam-0.4.0-system-lua.patch
>
>diff --git a/bam-0.4.0-system-lua.patch b/bam-0.4.0-system-lua.patch
>new file mode 100644
>index 0000000..2728d46
>--- /dev/null
>+++ b/bam-0.4.0-system-lua.patch
>@@ -0,0 +1,18 @@
>+diff -up bam-0.4.0/make_unix_clang.sh~ bam-0.4.0/make_unix_clang.sh
>+--- bam-0.4.0/make_unix_clang.sh~	2010-08-09 21:08:24.000000000 +0300
>++++ bam-0.4.0/make_unix_clang.sh	2014-03-18 10:01:57.082213928 +0200
>+@@ -1,4 +1,4 @@
>+ #!/bin/sh
>+ clang -Wall -ansi -pedantic src/tools/txt2c.c -o src/tools/txt2c
>+ src/tools/txt2c src/base.lua src/tools.lua src/driver_gcc.lua src/driver_cl.lua > src/internal_base.h
>+-clang -Wall -ansi -pedantic src/*.c src/lua/*.c -o bam -I src/lua -lm -lpthread -ldl -O2 -rdynamic $*
>++clang -Wall -ansi -pedantic src/*.c -o bam $(pkg-config --cflags --libs lua-5.1 || pkg-config --cflags --libs lua) -lm -lpthread -ldl -O2 -rdynamic $*
>+diff -up bam-0.4.0/make_unix.sh~ bam-0.4.0/make_unix.sh
>+--- bam-0.4.0/make_unix.sh~	2010-08-09 21:08:24.000000000 +0300
>++++ bam-0.4.0/make_unix.sh	2014-03-18 10:01:37.593815811 +0200
>+@@ -1,4 +1,4 @@
>+ #!/bin/sh
>+ gcc -Wall -ansi -pedantic src/tools/txt2c.c -o src/tools/txt2c
>+ src/tools/txt2c src/base.lua src/tools.lua src/driver_gcc.lua src/driver_cl.lua > src/internal_base.h
>+-gcc -Wall -ansi -pedantic src/*.c src/lua/*.c -o bam -I src/lua -lm -lpthread -ldl -O2 -rdynamic $*
>++gcc -Wall -ansi -pedantic src/*.c -o bam $(pkg-config --cflags --libs lua-5.1 || pkg-config --cflags --libs lua) -lm -lpthread -ldl -O2 -rdynamic $*
>diff --git a/bam.spec b/bam.spec
>index fb342ea..672f8c9 100644
>--- a/bam.spec
>+++ b/bam.spec
>@@ -1,14 +1,21 @@
> Name:           bam
> Version:        0.4.0
> 
>-Release:        6%{?dist}
>+Release:        7%{?dist}
> Summary:        A build-system
> 
> Group:          Amusements/Games
> License:        zlib
> URL:            http://matricks.github.com/bam/
> Source0:        http://github.com/downloads/matricks/bam/%{name}-%{version}.tar.bz2
>+Patch0:         bam-0.4.0-system-lua.patch
> 
>+# Need lua 5.1
>+%if 0%{?fedora} < 20
>+BuildRequires:  lua-devel
>+%else
>+BuildRequires:  compat-lua-devel
>+%endif
> 
> %description
> A tool that controls process of producing executables of
>@@ -17,6 +24,8 @@ software from its source code. Used to build the Teeworlds game.
> 
> %prep
> %setup -q
>+%patch0 -p1
>+rm -r src/lua
> 
> 
> %build
>@@ -34,6 +43,9 @@ install -D -m 0755 %{name} \
> 
> 
> %changelog
>+* Tue Mar 18 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 0.4.0-7
>+- Use system lua instead of bundled one
>+
> * Thu Oct 24 2013 Lubomir Rintel <lkundrak@v3.sk> - 0.4.0-6
> - Bulk sad and useless attempt at consistent SPEC file formatting
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1077533: 875830