mirror of
https://github.com/RGBCube/serenity
synced 2025-07-30 12:37:50 +00:00
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.
This commit is contained in:
parent
4b412e8fee
commit
b760a1a4ba
23 changed files with 135 additions and 529 deletions
52
Ports/citron/patches/0004-Don-t-mess-with-libsocket.patch
Normal file
52
Ports/citron/patches/0004-Don-t-mess-with-libsocket.patch
Normal file
|
@ -0,0 +1,52 @@
|
|||
From 3f73149c75a5755c2b45334abe682dd4b970144b Mon Sep 17 00:00:00 2001
|
||||
From: Ali Mohammad Pur <ali.mpfard@gmail.com>
|
||||
Date: Fri, 11 Feb 2022 16:46:16 +0330
|
||||
Subject: [PATCH 4/9] Don't mess with libsocket
|
||||
|
||||
---
|
||||
makefile | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/makefile b/makefile
|
||||
index ded4d5a..b262cd0 100644
|
||||
--- 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
|
||||
DESTDIR ?= /
|
||||
BINDIR ?= $(DESTDIR)/usr/local/bin
|
||||
@@ -57,7 +56,7 @@ LEXTRACF += $(LDFLAGS) -flto -lstdc++
|
||||
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 =
|
||||
TCC_STATICS =
|
||||
|
||||
@@ -131,7 +130,6 @@ debug: cxx ctr
|
||||
|
||||
clean:
|
||||
rm -rf $(BUILDDIR)
|
||||
- $(MAKE) -C $(LIBSOCKETDIR) clean
|
||||
$(MAKE) -C src/lib/tcc clean
|
||||
|
||||
cxx:
|
||||
@@ -146,10 +144,6 @@ build_tcc_statics:
|
||||
$(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
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue