Update to lua-lpeg-0.12.2.

This commit is contained in:
ajacoutot 2015-06-05 08:27:26 +00:00
parent 3c3204c06a
commit 052dbb71eb
3 changed files with 10 additions and 27 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2014/03/11 22:22:46 jturner Exp $
# $OpenBSD: Makefile,v 1.14 2015/06/05 08:27:26 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= parsing expression grammars library for lua
DISTNAME= lpeg-0.12
DISTNAME= lpeg-0.12.2
PKGNAME= lua-${DISTNAME}
CATEGORIES= devel
MASTER_SITES= http://www.inf.puc-rio.br/~roberto/lpeg/
@ -17,6 +17,7 @@ MODULES= lang/lua
ALL_TARGET= lpeg.so
MAKE_FILE= makefile
MAKE_FLAGS= CC=${CC} COPT="${CFLAGS}" DLLFLAGS="-shared"
pre-configure:
${SUBST_CMD} ${WRKSRC}/makefile

View File

@ -1,2 +1,2 @@
SHA256 (lpeg-0.12.tar.gz) = 76VFFEzSGe7oI692JNkPeMIjBne6dAtxUcXQwwN3i3Y=
SIZE (lpeg-0.12.tar.gz) = 66649
SHA256 (lpeg-0.12.2.tar.gz) = aq0nC5HRscb9dfaOFiMpoEpkTlDpF9VfRsyDhLcSAAQ=
SIZE (lpeg-0.12.2.tar.gz) = 68122

View File

@ -1,14 +1,14 @@
$OpenBSD: patch-makefile,v 1.9 2014/03/11 22:22:46 jturner Exp $
--- makefile.orig Fri Apr 12 12:31:19 2013
+++ makefile Fri Feb 28 11:23:33 2014
$OpenBSD: patch-makefile,v 1.10 2015/06/05 08:27:26 ajacoutot Exp $
--- makefile.orig Wed Mar 4 18:34:17 2015
+++ makefile Fri Jun 5 10:24:55 2015
@@ -1,5 +1,5 @@
LIBNAME = lpeg
-LUADIR = /usr/include/lua5.1/
-LUADIR = ../lua/
+LUADIR = ${MODLUA_INCL_DIR}
COPT = -O2
# COPT = -DLPEG_DEBUG -g
@@ -15,15 +15,13 @@ CWARNS = -Wall -Wextra -pedantic \
@@ -15,7 +15,6 @@ CWARNS = -Wall -Wextra -pedantic \
-Wundef \
-Wwrite-strings \
-Wbad-function-cast \
@ -16,21 +16,3 @@ $OpenBSD: patch-makefile,v 1.9 2014/03/11 22:22:46 jturner Exp $
-Wmissing-prototypes \
-Wnested-externs \
-Wstrict-prototypes \
# -Wunreachable-code \
-CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
-CC = gcc
+CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
@@ -36,7 +34,7 @@ macosx:
make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
lpeg.so: $(FILES)
- env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
+ env $(CC) -shared $(FILES) -o lpeg.so
$(FILES): makefile