gentoo resync : 28.04.2021

2 files changed, 12 insertions, 30 deletions

diff --git a/dev-lang/mujs/files/mujs-1.0.5-flags.patch b/dev-lang/mujs/files/mujs-1.0.5-flags.patch
deleted file mode 100644
index 50de4fcff21e..000000000000
--- a/dev-lang/mujs/files/mujs-1.0.5-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile	2018-09-11 12:47:31.000000000 +0200
-+++ b/Makefile	2018-10-28 20:09:17.000000000 +0100
-@@ -15,7 +15,7 @@
- 
- # Compiler flags for various configurations:
- 
--CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
-+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
- 
- ifeq "$(CC)" "clang"
-   CFLAGS += -Wunreachable-code
-@@ -30,9 +30,6 @@
- else ifeq "$(build)" "sanitize"
-   CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
-   LDFLAGS += -fsanitize=address
--else
--  CFLAGS += -Os
--  LDFLAGS += -Wl,-s
- endif
- 
- ifeq "$(HAVE_READLINE)" "yes"
-@@ -78,7 +75,7 @@
- 
- $(OUT)/libmujs.so: one.c $(HDRS)
- 	@ mkdir -p $(dir $@)
--	$(CC) $(CFLAGS) -fPIC -shared -o $@ $< -lm
-+	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lm
- 
- $(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
- 	@ mkdir -p $(dir $@)
diff --git a/dev-lang/mujs/files/mujs-1.1.1-flags.patch b/dev-lang/mujs/files/mujs-1.1.1-flags.patch
new file mode 100644
index 000000000000..f3dbdfd44cd1
--- /dev/null
+++ b/dev-lang/mujs/files/mujs-1.1.1-flags.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -32,9 +32,6 @@ ifeq "$(build)" "debug"
+ else ifeq "$(build)" "sanitize"
+   CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
+   LDFLAGS += -fsanitize=address
+-else ifeq "$(build)" "release"
+-  CFLAGS += -O2
+-  LDFLAGS += -Wl,-s
+ endif
+ 
+ ifeq "$(HAVE_READLINE)" "yes"