summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-06-21 15:20:04 +0200
committerDavid Seifert <soap@gentoo.org>2020-06-21 15:20:04 +0200
commitfa3fe72ac3009600ce6c1597b4e2b221e03051c0 (patch)
treea78b7d61d5615ce12f065074cb831548f5049dd8
parentmedia-sound/fluidsynth: Remove old (diff)
downloadgentoo-fa3fe72ac3009600ce6c1597b4e2b221e03051c0.tar.gz
gentoo-fa3fe72ac3009600ce6c1597b4e2b221e03051c0.tar.bz2
gentoo-fa3fe72ac3009600ce6c1597b4e2b221e03051c0.zip
media-sound/gsm: [QA] Pass RANLIB to build system
Closes: https://bugs.gentoo.org/718050 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--media-sound/gsm/files/gsm-1.0.13-shared.patch30
-rw-r--r--media-sound/gsm/gsm-1.0.13-r1.ebuild4
2 files changed, 21 insertions, 13 deletions
diff --git a/media-sound/gsm/files/gsm-1.0.13-shared.patch b/media-sound/gsm/files/gsm-1.0.13-shared.patch
index fc99e2c3043..ba178092c2f 100644
--- a/media-sound/gsm/files/gsm-1.0.13-shared.patch
+++ b/media-sound/gsm/files/gsm-1.0.13-shared.patch
@@ -1,16 +1,24 @@
-diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
---- gsm-1.0-pl13.orig/Makefile 2006-04-26 22:14:26.000000000 +0300
-+++ gsm-1.0-pl13/Makefile 2009-09-08 14:50:02.000000000 +0300
-@@ -96,7 +96,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -96,16 +96,14 @@
# Other tools
SHELL = /bin/sh
-LN = ln
+LN = ln -s
BASENAME = basename
- AR = ar
+-AR = ar
ARFLAGS = cr
-@@ -140,6 +140,7 @@
+ RMFLAGS =
+ FIND = find
+ COMPRESS = compress
+ COMPRESSFLAGS =
+ # RANLIB = true
+-RANLIB = ranlib
+
+ #
+ # You shouldn't have to configure below this line if you're porting.
+@@ -140,6 +138,7 @@
# Targets
LIBGSM = $(LIB)/libgsm.a
@@ -18,7 +26,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
TOAST = $(BIN)/toast
UNTOAST = $(BIN)/untoast
-@@ -203,24 +204,43 @@
+@@ -203,24 +202,43 @@
# Object files
@@ -80,7 +88,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
TOAST_OBJECTS = $(SRC)/toast.o \
$(SRC)/toast_lin.o \
-@@ -228,7 +248,7 @@
+@@ -228,7 +246,7 @@
$(SRC)/toast_alaw.o \
$(SRC)/toast_audio.o
@@ -89,7 +97,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
# Manuals
-@@ -277,9 +297,12 @@
+@@ -277,9 +295,12 @@
$(CC) $(CFLAGS) $?
@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
@@ -103,7 +111,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
@-echo $(ROOT): Done.
tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,24 +322,29 @@
+@@ -299,24 +320,29 @@
# The basic API: libgsm
@@ -138,7 +146,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
# The local bin and lib directories
-@@ -426,7 +454,9 @@
+@@ -426,7 +452,9 @@
clean: semi-clean
-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 676c7daf803..7f0c2275a72 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -38,14 +38,14 @@ src_configure() {
multilib_src_compile() {
emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
- LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)"
+ LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
}
multilib_src_install() {
dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
emake -j1 INSTALL_ROOT="${ED}"/usr \
- LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" \
+ LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" \
GSM_INSTALL_LIB="${ED}"/usr/$(get_libdir) \
GSM_INSTALL_INC="${ED}"/usr/include/gsm \
GSM_INSTALL_MAN="${ED}"/usr/share/man/man3 \