summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-23 18:39:27 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-23 18:39:27 +0000
commitc61f32530228b67ed3ce7e1a35248a558859e0a2 (patch)
tree732b94ea3f55b233285b646c9f618fa41366583e /media-libs/libmikmod/files
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-c61f32530228b67ed3ce7e1a35248a558859e0a2.tar.gz
gentoo-2-c61f32530228b67ed3ce7e1a35248a558859e0a2.tar.bz2
gentoo-2-c61f32530228b67ed3ce7e1a35248a558859e0a2.zip
Link to -lm for -Wl,--as-needed.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libmikmod/files')
-rw-r--r--media-libs/libmikmod/files/libmikmod-3.2.0_beta2-autotools.patch21
1 files changed, 15 insertions, 6 deletions
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-autotools.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-autotools.patch
index 19bd32987d1a..78ce941aeb5e 100644
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-autotools.patch
+++ b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-autotools.patch
@@ -1,6 +1,6 @@
diff -ruN libmikmod-3.2.0-beta2.orig/configure.in libmikmod-3.2.0-beta2/configure.in
--- libmikmod-3.2.0-beta2.orig/configure.in 2004-02-21 00:08:30.000000000 +0200
-+++ libmikmod-3.2.0-beta2/configure.in 2009-07-23 21:00:52.000000000 +0300
++++ libmikmod-3.2.0-beta2/configure.in 2009-07-23 21:35:57.000000000 +0300
@@ -296,10 +296,10 @@
if test "`uname`" = "Linux" && test $libmikmod_driver_alsa = yes
then
@@ -35,9 +35,18 @@ diff -ruN libmikmod-3.2.0-beta2.orig/configure.in libmikmod-3.2.0-beta2/configur
else
CFLAGS="$CFLAGS -Wall"
fi
+@@ -727,7 +724,7 @@
+ if test "`uname`" != "Darwin"
+ then
+ REENTRANT="-pthread $REENTRANT"
+- LIB_LDADD="-pthread"
++ LIB_LDADD="-pthread -lm"
+ fi
+ fi
+ fi
diff -ruN libmikmod-3.2.0-beta2.orig/esd.m4 libmikmod-3.2.0-beta2/esd.m4
--- libmikmod-3.2.0-beta2.orig/esd.m4 1970-01-01 02:00:00.000000000 +0200
-+++ libmikmod-3.2.0-beta2/esd.m4 2009-07-23 20:56:26.000000000 +0300
++++ libmikmod-3.2.0-beta2/esd.m4 2009-07-23 21:35:45.000000000 +0300
@@ -0,0 +1,194 @@
+# Configure paths for ESD
+# Manish Singh 98-9-30
@@ -235,19 +244,19 @@ diff -ruN libmikmod-3.2.0-beta2.orig/esd.m4 libmikmod-3.2.0-beta2/esd.m4
+])
diff -ruN libmikmod-3.2.0-beta2.orig/libmikmod/Makefile.in libmikmod-3.2.0-beta2/libmikmod/Makefile.in
--- libmikmod-3.2.0-beta2.orig/libmikmod/Makefile.in 2004-02-19 15:34:00.000000000 +0200
-+++ libmikmod-3.2.0-beta2/libmikmod/Makefile.in 2009-07-23 21:00:48.000000000 +0300
++++ libmikmod-3.2.0-beta2/libmikmod/Makefile.in 2009-07-23 21:36:14.000000000 +0300
@@ -73,7 +73,7 @@
rm -f Makefile
$(LIB): $(OBJ)
- $(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@ $(OBJ) -lm $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \
$(top_srcdir)/dlapi/dlfcn.h
diff -ruN libmikmod-3.2.0-beta2.orig/libmikmod-config.in libmikmod-3.2.0-beta2/libmikmod-config.in
--- libmikmod-3.2.0-beta2.orig/libmikmod-config.in 2004-01-21 03:36:34.000000000 +0200
-+++ libmikmod-3.2.0-beta2/libmikmod-config.in 2009-07-23 21:00:48.000000000 +0300
++++ libmikmod-3.2.0-beta2/libmikmod-config.in 2009-07-23 21:35:45.000000000 +0300
@@ -50,7 +50,7 @@
;;
--libs)
@@ -259,7 +268,7 @@ diff -ruN libmikmod-3.2.0-beta2.orig/libmikmod-config.in libmikmod-3.2.0-beta2/l
echo "${usage}" 1>&2
diff -ruN libmikmod-3.2.0-beta2.orig/libmikmod.m4 libmikmod-3.2.0-beta2/libmikmod.m4
--- libmikmod-3.2.0-beta2.orig/libmikmod.m4 2004-01-21 03:36:34.000000000 +0200
-+++ libmikmod-3.2.0-beta2/libmikmod.m4 2009-07-23 21:00:35.000000000 +0300
++++ libmikmod-3.2.0-beta2/libmikmod.m4 2009-07-23 21:35:45.000000000 +0300
@@ -8,7 +8,7 @@
dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and
dnl LIBMIKMOD_LDADD