Update janet to 1.4.0

This commit is contained in:
jturner 2019-10-15 19:05:51 +00:00
parent dfb1b1a45b
commit 39fa43b2a9
3 changed files with 12 additions and 12 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.12 2019/09/23 22:22:10 jturner Exp $
# $OpenBSD: Makefile,v 1.13 2019/10/15 19:05:51 jturner Exp $
COMMENT = functional and imperative programming language
CATEGORIES = lang
GH_ACCOUNT = janet-lang
GH_PROJECT = janet
GH_TAGNAME = v1.3.1
GH_TAGNAME = v1.4.0
SHARED_LIBS += janet 1.0 # 0.0

View File

@ -1,2 +1,2 @@
SHA256 (janet-1.3.1.tar.gz) = 8U3p4uHbVwfkihX0Ji9M6Mn/mbKzq8WepqFJPVS9TtQ=
SIZE (janet-1.3.1.tar.gz) = 931783
SHA256 (janet-1.4.0.tar.gz) = w1MFIRlAhynTqDMs7qIoIW7EO7BEQXiS6J45p8X9Gwc=
SIZE (janet-1.4.0.tar.gz) = 934946

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.8 2019/09/23 22:22:10 jturner Exp $
$OpenBSD: patch-Makefile,v 1.9 2019/10/15 19:05:51 jturner Exp $
Use a date stamp for JANET_BUILD to avoid using git.
Replace hardcoded -O2.
@ -8,27 +8,27 @@ Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -27,17 +27,17 @@ PREFIX?=/usr/local
INCLUDEDIR=$(PREFIX)/include
BINDIR=$(PREFIX)/bin
LIBDIR=$(PREFIX)/lib
INCLUDEDIR?=$(PREFIX)/include
BINDIR?=$(PREFIX)/bin
LIBDIR?=$(PREFIX)/lib
-JANET_BUILD?="\"$(shell git log --pretty=format:'%h' -n 1)\""
+JANET_BUILD?="\"$(shell date +%Y%m%d)\""
CLIBS=-lm
JANET_TARGET=build/janet
JANET_LIBRARY=build/libjanet.so
JANET_STATIC_LIBRARY=build/libjanet.a
JANET_PATH?=$(PREFIX)/lib/janet
JANET_PATH?=$(LIBDIR)/janet
-MANPATH?=$(PREFIX)/share/man/man1/
+MANPATH?=$(PREFIX)/man/man1/
PKG_CONFIG_PATH?=$(PREFIX)/lib/pkgconfig
PKG_CONFIG_PATH?=$(LIBDIR)/pkgconfig
DEBUGGER=gdb
-CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -Isrc/conf -fpic -O2 -fvisibility=hidden \
-CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -Isrc/conf -fPIC -O2 -fvisibility=hidden \
+CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -Isrc/conf -fPIC $(FLAGS) -fvisibility=hidden \
-DJANET_BUILD=$(JANET_BUILD)
LDFLAGS=-rdynamic
@@ -295,23 +295,20 @@ build/janet.pc: $(JANET_TARGET)
@@ -296,23 +296,20 @@ build/janet.pc: $(JANET_TARGET)
echo 'Libs.private: $(CLIBS)' >> $@
install: $(JANET_TARGET) build/janet.pc