SHA256
10
0
forked from pool/tolua

Accepting request 998859 from home:gmbr3:Lua

- Make tolua-5.2.0-shared.patch more useful
  * Remove LUA_C89_NUMBERS
- Prevent ansi by overriding WARN
- Add optflags by overriding WARN

OBS-URL: https://build.opensuse.org/request/show/998859
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/tolua?expand=0&rev=10
This commit is contained in:
2022-08-23 14:21:32 +00:00
committed by Git OBS Bridge
parent 29a5a1a616
commit 6b3a719883
3 changed files with 29 additions and 21 deletions

View File

@@ -8,8 +8,8 @@ Index: tolua-5.2.4/config
#CPPFLAGS= -O2 $(WARN) $(INC)
-CFLAGS= -g $(WARN) $(INC)
-CPPFLAGS= -g $(WARN) $(INC)
+CFLAGS= -fPIC -DLUA_C89_NUMBERS $(WARN) $(INC)
+CPPFLAGS= -fPIC -DLUA_C89_NUMBERS $(WARN) $(INC)
+CFLAGS= -fPIC $(WARN) $(INC)
+CPPFLAGS= -fPIC $(WARN) $(INC)
Index: tolua-5.2.4/src/bin/Makefile
===================================================================
--- tolua-5.2.4.orig/src/bin/Makefile
@@ -65,10 +65,10 @@ Index: tolua-5.2.4/Makefile
+VERSION = $(MAJOR).$(MINOR).$(REL)
+
+PREFIX = /usr
+BINDIR = $(DESTDIR)$(PREFIX)/bin
+BINDIR = $(PREFIX)/bin
+LIB = lib
+LIBDIR = $(DESTDIR)$(PREFIX)/$(LIB)
+INCLUDEDIR = $(DESTDIR)$(PREFIX)/include
+LIBDIR = $(PREFIX)/$(LIB)
+INCLUDEDIR = $(PREFIX)/include
+
tolua:
cd src/lib; make all
@@ -78,15 +78,15 @@ Index: tolua-5.2.4/Makefile
cd src/tests; make all
+install:
+ mkdir -p $(BINDIR)
+ mkdir -p $(INCLUDEDIR)
+ mkdir -p $(LIBDIR)
+ install -m 0755 bin/tolua $(BINDIR)
+ install -m 0644 include/tolua.h $(INCLUDEDIR)
+ install -m 0644 lib/libtolua.so.$(VERSION) $(LIBDIR)
+ ln -sf $(PREFIX)/$(LIB)/libtolua.so.$(VERSION) $(LIBDIR)/libtolua.so.$(MAJOR).$(MINOR)
+ ln -sf $(PREFIX)/$(LIB)/libtolua.so.$(VERSION) $(LIBDIR)/libtolua.so.$(MAJOR)
+ ln -sf $(PREFIX)/$(LIB)/libtolua.so.$(VERSION) $(LIBDIR)/libtolua.so
+ mkdir -p $(DESTDIR)$(BINDIR)
+ mkdir -p $(DESTDIR)$(INCLUDEDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)
+ install -m 0755 bin/tolua $(DESTDIR)$(BINDIR)
+ install -m 0644 include/tolua.h $(DESTDIR)$(INCLUDEDIR)
+ install -m 0755 lib/libtolua.so.$(VERSION) $(DESTDIR)$(LIBDIR)
+ ln -sf $(LIBDIR)/libtolua.so.$(VERSION) $(DESTDIR)$(LIBDIR)/libtolua.so.$(MAJOR).$(MINOR)
+ ln -sf $(LIBDIR)/libtolua.so.$(VERSION) $(DESTDIR)$(LIBDIR)/libtolua.so.$(MAJOR)
+ ln -sf $(LIBDIR)/libtolua.so.$(VERSION) $(DESTDIR)$(LIBDIR)/libtolua.so
+
all clean klean:
cd src/lib; make $@

View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Aug 23 14:18:35 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
- Make tolua-5.2.0-shared.patch more useful
* Remove LUA_C89_NUMBERS
- Prevent ansi by overriding WARN
- Add optflags by overriding WARN
-------------------------------------------------------------------
Thu Aug 12 14:23:00 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>

View File

@@ -66,17 +66,17 @@ needed to develop applications that require these.
%setup -q
%patch0 -p1
%patch1 -p1
sed -i -e 's|LUA=%{_prefix}/local|LUA=%{_prefix}|g' \
config
sed -i -e 's|LUALIB=$(LUA)/lib|LUALIB=$(LUA)/%{_lib}|g' \
config
sed -i -e 's|$(OPTFLAGS)|%{optflags} -I%{lua_incdir} -std=gnu11|g' {config,src/bin/Makefile}
%build
make %{?_smp_mflags}
# no jobserver
make -e \
LUA=%{_prefix} \
LUALIB=%{_libdir} \
LUAINC=%{_includedir}/lua%{lua_version} \
WARN='%{optflags}'
%install
make install DESTDIR=%{buildroot} LIB=%{_lib}
%make_install LIBDIR=%{_libdir}
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig