Ports: Update nesalizer port to use Serenity fork

This commit is contained in:
Dan MacDonald 2019-12-08 17:49:54 +00:00 committed by Andreas Kling
parent f5dfb29607
commit 8423be2593
Notes: sideshowbarker 2024-07-19 10:55:10 +09:00
3 changed files with 2 additions and 64 deletions

View file

@ -1,7 +1,6 @@
#!/bin/bash ../.port_include.sh
port=nesalizer
version=git
version=master
curlopts="-L"
workdir=nesalizer-master
files="https://github.com/ulfalizer/nesalizer/archive/master.tar.gz nesalizer-master.tar.gz"
files="https://github.com/SerenityOS/nesalizer/archive/master.zip nesalizer-master.zip"
depends=SDL2

View file

@ -1,33 +0,0 @@
--- ./Makefile 2016-09-18 10:02:04.000000000 +0100
+++ ./Makefile-serenity 2019-11-04 13:43:24.842907912 +0000
@@ -58,7 +58,7 @@
objects = $(c_objects) $(cpp_objects)
deps = $(addprefix $(BUILD_DIR)/,$(c_sources:=.d) $(cpp_sources:=.d))
-LDLIBS := $(shell sdl2-config --libs) -lrt
+LDLIBS := -L$(SERENITY_ROOT)/Root/lib -lSDL2 -lgui -lipc -ldraw -lcore -lpthread
ifeq ($(INCLUDE_DEBUGGER),1)
LDLIBS += -lreadline
@@ -105,12 +105,12 @@
endif
ifneq ($(findstring debug,$(CONF)),)
- compile_flags += -ggdb
+ compile_flags += -ggdb -fno-rtti
endif
ifneq ($(findstring release,$(CONF)),)
# Including -Ofast when linking (by including $(optimizations)) gives a
# different binary size. Might be worth investigating why.
- compile_flags += $(optimizations) -DOPTIMIZING
+ compile_flags += $(optimizations) -DOPTIMIZING -fno-rtti
link_flags += $(optimizations) -fuse-linker-plugin
endif
@@ -175,3 +175,6 @@
.PHONY: clean
clean: ; $(q)-rm -rf $(BUILD_DIR)
+
+install:
+ install $(BUILD_DIR)/${EXECUTABLE} ${DESTDIR}/bin/${EXECUTABLE}

View file

@ -1,28 +0,0 @@
--- ./src/common.cpp 2016-09-18 10:02:04.000000000 +0100
+++ ./src/common-serenity.cpp 2019-11-02 16:58:54.509792761 +0000
@@ -1,6 +1,6 @@
#include "common.h"
-#include <execinfo.h>
+// #include <execinfo.h>
#include <signal.h>
//
@@ -96,7 +96,7 @@
static void fatal_signal_handler(int sig) {
// Use non-async-signal-safe functions. Likely to work in practice.
- static void *backtrace_buffer[100];
+ /*static void *backtrace_buffer[100];
static char addr2line_cmd_buf[100];
fprintf(stderr, "caught fatal signal '%s'. Backtrace:\n\n", strsignal(sig));
@@ -124,7 +124,7 @@
abort();
}
- abort();
+ abort();*/
}
static void install_fatal_signal_handler(int sig) {