mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 02:12:09 -05:00
Code Issues Projects Releases Packages Wiki Activity
serenity/Ports/citron/patches/0004-Don-t-mess-with-libsocket.patch

53 lines
1.5 KiB
Diff
Raw Normal View History

Ports: Update the citron patches after upstreaming a few This also switches to checking out a specific commit instead of just the master HEAD, as the port linter requires a hash (which is imo pointless in this case), and we can't provide a stable hash for the master branch HEAD.
2022-02-13 17:06:03 +03:30
From 3f73149c75a5755c2b45334abe682dd4b970144b Mon Sep 17 00:00:00 2001
Ports: Add a citron port This disables the GC, so the REPL doesn't run, but basic programs do work.
2022-02-11 18:56:00 +03:30
From: Ali Mohammad Pur <ali.mpfard@gmail.com>
Date: Fri, 11 Feb 2022 16:46:16 +0330
Ports: Update the citron patches after upstreaming a few This also switches to checking out a specific commit instead of just the master HEAD, as the port linter requires a hash (which is imo pointless in this case), and we can't provide a stable hash for the master branch HEAD.
2022-02-13 17:06:03 +03:30
Subject: [PATCH 4/9] Don't mess with libsocket
Ports: Add a citron port This disables the GC, so the REPL doesn't run, but basic programs do work.
2022-02-11 18:56:00 +03:30
---
Ports: Update the citron patches after upstreaming a few This also switches to checking out a specific commit instead of just the master HEAD, as the port linter requires a hash (which is imo pointless in this case), and we can't provide a stable hash for the master branch HEAD.
2022-02-13 17:06:03 +03:30
makefile | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
Ports: Add a citron port This disables the GC, so the REPL doesn't run, but basic programs do work.
2022-02-11 18:56:00 +03:30
diff --git a/makefile b/makefile
Ports: Update the citron patches after upstreaming a few This also switches to checking out a specific commit instead of just the master HEAD, as the port linter requires a hash (which is imo pointless in this case), and we can't provide a stable hash for the master branch HEAD.
2022-02-13 17:06:03 +03:30
index ded4d5a..b262cd0 100644
Ports: Add a citron port This disables the GC, so the REPL doesn't run, but basic programs do work.
2022-02-11 18:56:00 +03:30
--- a/makefile
+++ b/makefile
@@ -2,7 +2,6 @@ DEBUG_VERSION := 1603
DEBUG_BUILD_VERSION := "\"$(DEBUG_VERSION)\""
location = $(CURDIR)/$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
new_makefile_l1 := $(shell perl -ne '/((DEBUG_VERSION := )(\d+))/ && print (sprintf("%s%s", "$$2", "$$3"+1));' $(location))
-LIBSOCKETDIR = src/lib/libsocket
BUILDDIR ?= build
Ports: Update the citron patches after upstreaming a few This also switches to checking out a specific commit instead of just the master HEAD, as the port linter requires a hash (which is imo pointless in this case), and we can't provide a stable hash for the master branch HEAD.
2022-02-13 17:06:03 +03:30
DESTDIR ?= /
BINDIR ?= $(DESTDIR)/usr/local/bin
@@ -57,7 +56,7 @@ LEXTRACF += $(LDFLAGS) -flto -lstdc++
Ports: Add a citron port This disables the GC, so the REPL doesn't run, but basic programs do work.
2022-02-11 18:56:00 +03:30
OBJS = siphash.o utf8.o memory.o util.o base.o collections.o file.o system.o \
lexer.o lexer_plug.o parser.o walker.o marshal.o reflect.o fiber.o \
importlib.o coroutine.o symbol.o generator.o base_extensions.o citron.o \
- promise.o symbol_cxx.o world.o libsocket.so
+ promise.o symbol_cxx.o world.o
EXTRAOBJS =
Ports: Update the citron patches after upstreaming a few This also switches to checking out a specific commit instead of just the master HEAD, as the port linter requires a hash (which is imo pointless in this case), and we can't provide a stable hash for the master branch HEAD.
2022-02-13 17:06:03 +03:30
TCC_STATICS =
Ports: Add a citron port This disables the GC, so the REPL doesn't run, but basic programs do work.
2022-02-11 18:56:00 +03:30
Ports: Update the citron patches after upstreaming a few This also switches to checking out a specific commit instead of just the master HEAD, as the port linter requires a hash (which is imo pointless in this case), and we can't provide a stable hash for the master branch HEAD.
2022-02-13 17:06:03 +03:30
@@ -131,7 +130,6 @@ debug: cxx ctr
Ports: Add a citron port This disables the GC, so the REPL doesn't run, but basic programs do work.
2022-02-11 18:56:00 +03:30
clean:
rm -rf $(BUILDDIR)
- $(MAKE) -C $(LIBSOCKETDIR) clean
$(MAKE) -C src/lib/tcc clean
cxx:
Ports: Update the citron patches after upstreaming a few This also switches to checking out a specific commit instead of just the master HEAD, as the port linter requires a hash (which is imo pointless in this case), and we can't provide a stable hash for the master branch HEAD.
2022-02-13 17:06:03 +03:30
@@ -146,10 +144,6 @@ build_tcc_statics:
Ports: Add a citron port This disables the GC, so the REPL doesn't run, but basic programs do work.
2022-02-11 18:56:00 +03:30
$(BUILDDIR)/%.a: src/lib/tcc/%.a
cp $< $@
-$(BUILDDIR)/libsocket.so:
- make -C $(LIBSOCKETDIR)
- cp $(LIBSOCKETDIR)/libsocket.so $(BUILDDIR)/libsocket.so
-
$(BUILDDIR)/%.o: src/%.c
$(CC) -fopenmp $(CFLAGS) -c $< -o $@
--
2.34.1
Reference in a new issue Copy permalink