haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

janet, bump version (#9704)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-10-29 14:24:43 +00:00
committed by GitHub
parent b2be6eaf53
commit e434816177
3 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dev-lang/janet/janet-1.3.1.recipe → dev-lang/janet/janet-1.32.1.recipe
View File

@@ -7,11 +7,11 @@ in C, meta-programming with macros, and bytecode assembly."
HOMEPAGE="https://janet-lang.org/"
COPYRIGHT="2019 Calvin Rose and contributors"
LICENSE="MIT"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/janet-lang/janet/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="f14de9e2e1db5707e48a15f4262f4ce8c9ff99b2b3abc59ea6a1493d54bd4ed4"
CHECKSUM_SHA256="ac74444f1b545830c34738fe9ebb58c865ea4b819b0b0c3124315c646d9ce4cb"
SOURCE_FILENAME="janet-$portVersion.tar.gz"
PATCHES="janet-1.3.1.patch"
PATCHES="janet-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -65,6 +65,7 @@ BUILD()
INSTALL()
{
make install BINDIR="$commandBinDir" \
MANDIR="$manDir" \
INCLUDEDIR="$includeDir" \
LIBDIR="$libDir" \
MANPATH="$manDir/man1" \

37
dev-lang/janet/patches/janet-1.3.1.patch
View File

@@ -1,37 +0,0 @@
diff --git a/Makefile b/Makefile
index 54c434a..c7a8935 100644
--- a/Makefile
+++ b/Makefile
@@ -24,17 +24,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)\""
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/
-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 \
@@ -53,7 +53,8 @@ else ifeq ($(UNAME), Linux)
CLIBS:=$(CLIBS) -lrt -ldl
endif
# For other unix likes, add flags here!
-ifeq ($(UNAME),Haiku)
+ifeq ($(UNAME), Haiku)
+ LDCONFIG:=
LDFLAGS=-Wl,--export-dynamic
endif

54
dev-lang/janet/patches/janet-1.32.1.patchset Normal file
View File

@@ -0,0 +1,54 @@
From c3e9b92075346a0a5bf7184d5b9f26a9807bb004 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sun, 29 Oct 2023 14:43:57 +0100
Subject: Fix path for manpage
diff --git a/Makefile b/Makefile
index abee818..ee7a618 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ PREFIX?=/usr/local
JANETCONF_HEADER?=src/conf/janetconf.h
INCLUDEDIR?=$(PREFIX)/include
BINDIR?=$(PREFIX)/bin
+MANDIR?=$(PREFIX)/share/man
LIBDIR?=$(PREFIX)/lib
JANET_BUILD?="\"$(shell git log --pretty=format:'%h' -n 1 2> /dev/null || echo local)\""
CLIBS=-lm -lpthread
@@ -36,7 +37,7 @@ JANET_IMPORT_LIB=build/janet.lib
JANET_LIBRARY=build/libjanet.so
JANET_STATIC_LIBRARY=build/libjanet.a
JANET_PATH?=$(LIBDIR)/janet
-JANET_MANPATH?=$(PREFIX)/share/man/man1/
+JANET_MANPATH?=$(MANDIR)/man1/
JANET_PKG_CONFIG_PATH?=$(LIBDIR)/pkgconfig
JANET_DIST_DIR?=janet-dist
JANET_BOOT_FLAGS:=. JANET_PATH '$(JANET_PATH)'
--
2.42.0
From 539b93975c4ebc15b6ad21c1b3209ea62e8a8be7 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sun, 29 Oct 2023 14:44:29 +0100
Subject: Fix linking error with libnetwork
diff --git a/Makefile b/Makefile
index ee7a618..9813960 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,9 @@ else ifeq ($(UNAME), Linux)
endif
# For other unix likes, add flags here!
+# For Haiku
ifeq ($(UNAME), Haiku)
+ CLIBS:=$(CLIBS) -lnetwork
LDCONFIG:=true
LDFLAGS=-Wl,--export-dynamic
endif
--
2.42.0