From 711155ec8b347758d52f5c6829218e8351516961 Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Tue, 16 Jun 2020 23:02:42 +0900 Subject: dev-libs/libmoe: update patches Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Akinori Hattori --- dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch | 61 ----------------------- dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch | 9 ---- dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch | 23 --------- dev-libs/libmoe/files/libmoe-gcc-5.patch | 61 +++++++++++++++++++++++ dev-libs/libmoe/files/libmoe-gentoo.patch | 39 +++++++++++++++ dev-libs/libmoe/libmoe-1.5.8-r3.ebuild | 9 ++-- 6 files changed, 103 insertions(+), 99 deletions(-) delete mode 100644 dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch delete mode 100644 dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch delete mode 100644 dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch create mode 100644 dev-libs/libmoe/files/libmoe-gcc-5.patch create mode 100644 dev-libs/libmoe/files/libmoe-gentoo.patch (limited to 'dev-libs') diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch b/dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch deleted file mode 100644 index a990a37fe240..000000000000 --- a/dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -urN b/iso2mb.c c/iso2mb.c ---- b/iso2mb.c 2015-07-06 21:38:49.129658661 +0000 -+++ c/iso2mb.c 2015-07-07 18:50:17.211540572 +0000 -@@ -513,11 +513,11 @@ - return wc; - } - --mb_wchar_t -+__attribute__ ((gnu_inline)) __inline__ mb_wchar_t - mb_encode_to_wchar(mb_info_t *info) - MB_ENCODE_TO_WCHAR - --mb_wchar_t -+__attribute__ ((gnu_inline)) __inline__ mb_wchar_t - mb_fetch_wchar(mb_info_t *info) - MB_FETCH_WCHAR - -diff -urN b/mb2iso.c c/mb2iso.c ---- b/mb2iso.c 2015-07-06 21:38:49.133658683 +0000 -+++ c/mb2iso.c 2015-07-07 19:07:47.583244156 +0000 -@@ -900,7 +900,7 @@ - return n; - } - --size_t -+__attribute__ ((gnu_inline)) __inline__ size_t - mb_store_wchar(mb_wchar_t enc, mb_info_t *info) - MB_STORE_WCHAR - -diff -urN b/mb.h c/mb.h ---- b/mb.h 2015-07-06 21:38:49.133658683 +0000 -+++ c/mb.h 2015-07-07 18:50:17.211540572 +0000 -@@ -434,7 +434,7 @@ - } - - #ifdef __GNUC__ --extern __inline__ mb_wchar_t mb_encode_to_wchar(mb_info_t *info) MB_ENCODE_TO_WCHAR -+extern __attribute__ ((gnu_inline)) __inline__ mb_wchar_t mb_encode_to_wchar(mb_info_t *info); - #else - extern mb_wchar_t mb_encode_to_wchar(mb_info_t *info); - #endif -@@ -449,7 +449,7 @@ - } - - #ifdef __GNUC__ --extern __inline__ mb_wchar_t mb_fetch_wchar(mb_info_t *info) MB_FETCH_WCHAR -+extern __attribute__ ((gnu_inline)) __inline__ mb_wchar_t mb_fetch_wchar(mb_info_t *info); - #else - extern mb_wchar_t mb_fetch_wchar(mb_info_t *info); - #endif -@@ -552,7 +552,7 @@ - } - - #ifdef __GNUC__ --extern __inline__ size_t mb_store_wchar(mb_wchar_t enc, mb_info_t *info) MB_STORE_WCHAR -+extern __attribute__ ((gnu_inline)) __inline__ size_t mb_store_wchar(mb_wchar_t enc, mb_info_t *info); - #else - extern size_t mb_store_wchar(mb_wchar_t enc, mb_info_t *info); - #endif - - 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 -+ - #include "altmalloc.h" - - alt_allocater_t alt_malloc = malloc; diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch b/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch deleted file mode 100644 index 2cdfa1a24c22..000000000000 --- a/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Makefile b/Makefile -index 1bae380..605d674 100644 ---- a/Makefile -+++ b/Makefile -@@ -72,8 +72,7 @@ AR=ar - 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 - ./mk_btri <$< >$@-new && mv $@-new $@ - - mk_btri: btri.c btri.h altmalloc.o -- ${CC} ${CF} -DMAIN -o $@ $< altmalloc.o -+ ${CC} ${CF} ${LDFLAGS} -DMAIN -o $@ $< altmalloc.o - - mbconv.man: mbconv.pod - pod2man --section=${MANSECT} --center=' ' $< >$@ diff --git a/dev-libs/libmoe/files/libmoe-gcc-5.patch b/dev-libs/libmoe/files/libmoe-gcc-5.patch new file mode 100644 index 000000000000..a990a37fe240 --- /dev/null +++ b/dev-libs/libmoe/files/libmoe-gcc-5.patch @@ -0,0 +1,61 @@ +diff -urN b/iso2mb.c c/iso2mb.c +--- b/iso2mb.c 2015-07-06 21:38:49.129658661 +0000 ++++ c/iso2mb.c 2015-07-07 18:50:17.211540572 +0000 +@@ -513,11 +513,11 @@ + return wc; + } + +-mb_wchar_t ++__attribute__ ((gnu_inline)) __inline__ mb_wchar_t + mb_encode_to_wchar(mb_info_t *info) + MB_ENCODE_TO_WCHAR + +-mb_wchar_t ++__attribute__ ((gnu_inline)) __inline__ mb_wchar_t + mb_fetch_wchar(mb_info_t *info) + MB_FETCH_WCHAR + +diff -urN b/mb2iso.c c/mb2iso.c +--- b/mb2iso.c 2015-07-06 21:38:49.133658683 +0000 ++++ c/mb2iso.c 2015-07-07 19:07:47.583244156 +0000 +@@ -900,7 +900,7 @@ + return n; + } + +-size_t ++__attribute__ ((gnu_inline)) __inline__ size_t + mb_store_wchar(mb_wchar_t enc, mb_info_t *info) + MB_STORE_WCHAR + +diff -urN b/mb.h c/mb.h +--- b/mb.h 2015-07-06 21:38:49.133658683 +0000 ++++ c/mb.h 2015-07-07 18:50:17.211540572 +0000 +@@ -434,7 +434,7 @@ + } + + #ifdef __GNUC__ +-extern __inline__ mb_wchar_t mb_encode_to_wchar(mb_info_t *info) MB_ENCODE_TO_WCHAR ++extern __attribute__ ((gnu_inline)) __inline__ mb_wchar_t mb_encode_to_wchar(mb_info_t *info); + #else + extern mb_wchar_t mb_encode_to_wchar(mb_info_t *info); + #endif +@@ -449,7 +449,7 @@ + } + + #ifdef __GNUC__ +-extern __inline__ mb_wchar_t mb_fetch_wchar(mb_info_t *info) MB_FETCH_WCHAR ++extern __attribute__ ((gnu_inline)) __inline__ mb_wchar_t mb_fetch_wchar(mb_info_t *info); + #else + extern mb_wchar_t mb_fetch_wchar(mb_info_t *info); + #endif +@@ -552,7 +552,7 @@ + } + + #ifdef __GNUC__ +-extern __inline__ size_t mb_store_wchar(mb_wchar_t enc, mb_info_t *info) MB_STORE_WCHAR ++extern __attribute__ ((gnu_inline)) __inline__ size_t mb_store_wchar(mb_wchar_t enc, mb_info_t *info); + #else + extern size_t mb_store_wchar(mb_wchar_t enc, mb_info_t *info); + #endif + + diff --git a/dev-libs/libmoe/files/libmoe-gentoo.patch b/dev-libs/libmoe/files/libmoe-gentoo.patch new file mode 100644 index 000000000000..c4a754bd2aa8 --- /dev/null +++ b/dev-libs/libmoe/files/libmoe-gentoo.patch @@ -0,0 +1,39 @@ +--- a/Makefile ++++ b/Makefile +@@ -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} +@@ -116,7 +116,7 @@ + ./mk_btri <$< >$@-new && mv $@-new $@ + + mk_btri: btri.c btri.h altmalloc.o +- ${CC} ${CF} -DMAIN -o $@ $< altmalloc.o ++ ${CC} ${CF} ${LDFLAGS} -DMAIN -o $@ $< altmalloc.o + + mbconv.man: mbconv.pod + pod2man --section=${MANSECT} --center=' ' $< >$@ +--- a/altmalloc.c ++++ b/altmalloc.c +@@ -1,3 +1,5 @@ ++#include ++ + #include "altmalloc.h" + + alt_allocater_t alt_malloc = malloc; diff --git a/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild b/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild index 01e7722e7012..41ed7a8019e9 100644 --- a/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild +++ b/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,9 +19,8 @@ DEPEND="${RDEPEND}" HTML_DOCS=( libmoe.shtml ) PATCHES=( - "${FILESDIR}/${P}-gentoo.patch" - "${FILESDIR}/${P}-makefile.patch" - "${FILESDIR}/${P}-gcc5.patch" # taken from Debian + "${FILESDIR}/${PN}-gentoo.patch" + "${FILESDIR}/${PN}-gcc-5.patch" # taken from Debian ) src_prepare() { @@ -31,8 +30,6 @@ src_prepare() { -e "/^PREFIX=/s:=.*:=${EPREFIX}/usr:" \ -e "/^LIBSODIR=/s:=.*:=\$\{PREFIX}/$(get_libdir):" \ -e "/^MANDIR=/s:=.*:=\$\{PREFIX}/share/man:" \ - -e "/^CF=/s:=:=${CFLAGS} :" \ - -e "/^LF=/s:=:=${LDFLAGS} :" \ -e "s:=gcc:=$(tc-getCC):" \ -e "/^AR=/s:=ar:=$(tc-getAR):" \ Makefile || die -- cgit v1.2.3-65-gdbad