mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
78 lines
1.9 KiB
Plaintext
78 lines
1.9 KiB
Plaintext
From 90a9f48a082547954769111a8eab695a7f0c7f13 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..e3ceb6c 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 ea9f56aa89dff53a46f60097350b040980b6445d 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 e3ceb6c..150778c 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
|
|
|
|
|
|
From 7b8055c1899f7be002b61b27ad677e39aad6d1a5 Mon Sep 17 00:00:00 2001
|
|
From: Begasus <begasus@gmail.com>
|
|
Date: Sun, 29 Oct 2023 16:24:31 +0100
|
|
Subject: Disable cksum, crashes on 32bit
|
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 150778c..291a0f3 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -185,7 +185,7 @@ $(JANET_BOOT): $(JANET_BOOT_OBJECTS)
|
|
# Now the reason we bootstrap in the first place
|
|
build/c/janet.c: $(JANET_BOOT) src/boot/boot.janet
|
|
$(RUN) $(JANET_BOOT) $(JANET_BOOT_FLAGS) > $@
|
|
- cksum $@
|
|
+# cksum $@
|
|
|
|
##################
|
|
##### Quicky #####
|
|
--
|
|
2.42.0
|
|
|