diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
commit | feb0daf81d888e9160f9f94502de09b66f2a63fd (patch) | |
tree | b6e5c40ce2abef3da27ed50a023153f475e0ddef /dev-libs/libmoe/files | |
parent | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff) |
gentoo resync : 21.06.2020
Diffstat (limited to 'dev-libs/libmoe/files')
-rw-r--r-- | dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch | 9 | ||||
-rw-r--r-- | dev-libs/libmoe/files/libmoe-gcc-5.patch (renamed from dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch) | 0 | ||||
-rw-r--r-- | dev-libs/libmoe/files/libmoe-gentoo.patch (renamed from dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch) | 28 |
3 files changed, 22 insertions, 15 deletions
diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch b/dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch deleted file mode 100644 index cf436c11577b..000000000000 --- a/dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Naur libmoe-1.5.8.orig/altmalloc.c libmoe-1.5.8/altmalloc.c ---- libmoe-1.5.8.orig/altmalloc.c 2002-02-01 22:25:10.000000000 +0900 -+++ libmoe-1.5.8/altmalloc.c 2008-11-19 08:44:34.000000000 +0900 -@@ -1,3 +1,5 @@ -+#include <string.h> -+ - #include "altmalloc.h" - - alt_allocater_t alt_malloc = malloc; diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch b/dev-libs/libmoe/files/libmoe-gcc-5.patch index a990a37fe240..a990a37fe240 100644 --- a/dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch +++ b/dev-libs/libmoe/files/libmoe-gcc-5.patch diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch b/dev-libs/libmoe/files/libmoe-gentoo.patch index 2cdfa1a24c22..c4a754bd2aa8 100644 --- a/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch +++ b/dev-libs/libmoe/files/libmoe-gentoo.patch @@ -1,18 +1,26 @@ -diff --git a/Makefile b/Makefile -index 1bae380..605d674 100644 --- a/Makefile +++ b/Makefile -@@ -72,8 +72,7 @@ AR=ar +@@ -52,8 +52,8 @@ + INSTBIN=mbconv${EXT} + + DEBUG= +-CF=${DEBUG} -O2 -Wall -fpic -I. +-LF=-shared -Wl,-soname,${DEST}.so.${VER}.${RELEASE} ++CF=${DEBUG} -O2 -Wall -fpic -I. ${CFLAGS} ++LF=-shared -Wl,-soname,${DEST}.so.${VER}.${RELEASE} ${LDFLAGS} + CC=gcc + CPP=gcc -E + LD=gcc +@@ -72,7 +72,7 @@ all: ${INSTLIBA} mbconv mbconv.man mbconv: mbconv.c ${ALL} - ${CC} ${CF} -o $@ $< -L. -lmoe -- + ${CC} ${CF} ${LDFLAGS} -o $@ $< -L. -lmoe + ${DEST}.so: ${DEST}.so.${VER}.${RELEASE} - ln -sf $< $@ -@@ -116,7 +115,7 @@ ${BTRI_Cs}: %.c: %.mk_btri.c mk_btri +@@ -116,7 +116,7 @@ ./mk_btri <$< >$@-new && mv $@-new $@ mk_btri: btri.c btri.h altmalloc.o @@ -21,3 +29,11 @@ index 1bae380..605d674 100644 mbconv.man: mbconv.pod pod2man --section=${MANSECT} --center=' ' $< >$@ +--- a/altmalloc.c ++++ b/altmalloc.c +@@ -1,3 +1,5 @@ ++#include <string.h> ++ + #include "altmalloc.h" + + alt_allocater_t alt_malloc = malloc; |