From 5dceb8e8368ed420e125c3fa0d824e004a3f84e6 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Thu, 23 Jul 2009 18:39:27 +0000 Subject: Link to -lm for -Wl,--as-needed. Package-Manager: portage-2.2_rc33/cvs/Linux x86_64 --- media-libs/libmikmod/ChangeLog | 6 +++++- media-libs/libmikmod/Manifest | 4 ++-- .../files/libmikmod-3.2.0_beta2-autotools.patch | 21 +++++++++++++++------ 3 files changed, 22 insertions(+), 9 deletions(-) (limited to 'media-libs/libmikmod') diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog index 4b17413df2ed..2ea973c02178 100644 --- a/media-libs/libmikmod/ChangeLog +++ b/media-libs/libmikmod/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libmikmod # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.55 2009/07/23 18:07:55 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.56 2009/07/23 18:39:27 ssuominen Exp $ + + 23 Jul 2009; Samuli Suominen + files/libmikmod-3.2.0_beta2-autotools.patch: + Link to -lm for -Wl,--as-needed. *libmikmod-3.2.0_beta2 (23 Jul 2009) diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest index da009d539726..525a832dc2a4 100644 --- a/media-libs/libmikmod/Manifest +++ b/media-libs/libmikmod/Manifest @@ -5,7 +5,7 @@ AUX libmikmod-3.1.11-doubleRegister.patch 544 RMD160 c16e61ccc75d97781ce8d2d60a8 AUX libmikmod-3.1.11-m4.patch 268 RMD160 b11341869880ae7880318247efa7d771f741a152 SHA1 ccb57f72afaac800cfc73cd85ea3006bebbc6a45 SHA256 cd9b3a93005b332f298af392537651f2430df7f6400d68983a19788c33d401aa AUX libmikmod-3.1.11-respectflags.patch 1637 RMD160 b166b5e82e7683717afbfdbac89571c10fd01595 SHA1 895b5ab9ac850c004f00ff8f13ba18606fe110b7 SHA256 cec50c01cdf9ee1ea4df792444a3dd1b6c9317ccc3fb1ec48a9c37d90e72a55b AUX libmikmod-3.2.0_beta2-64bit.patch 1044 RMD160 5d16f56caae168d875a5bb607f098118cef16242 SHA1 7d6ac6f5b5773968a9d6ecfeefc2a9bef66e2cf5 SHA256 552d9edc4c4aedef74142d180f3ba91e242fa9cf3a24feefc5588716e9e12a3f -AUX libmikmod-3.2.0_beta2-autotools.patch 10094 RMD160 93e4806f06773df18b448e15fadd362162171dca SHA1 e877534500b21aac9593267df4e5a71e2ed7d377 SHA256 dad473607527fa10356731c226df2d302227d766d6b440a241f4df4179351910 +AUX libmikmod-3.2.0_beta2-autotools.patch 10264 RMD160 ea1718aaf0e75464522ba25b6aa8fd609a783667 SHA1 bb9ffc1164e01cb9ddb171573888501d647e3747 SHA256 fa0b1b75420efb86ad7ac627d1ac9b82ba233f594672879fcaa65778b7dc7513 AUX libmikmod-3.2.0_beta2-doubleRegister.patch 722 RMD160 9b40114b4a966747af2905aaa38f3b1ee7e1d263 SHA1 f57811b14706dc31ece6206bc472a3ed7288f422 SHA256 f658d3459ef5bebf8daea407961cfa5f5059035a5fbbb56f81b26807fbe907f2 AUX libmikmod-3.2.0_beta2-info.patch 1405 RMD160 7ce4c47e7ec34c5d2f33bd538d59a7f991563b0b SHA1 675cff9d348a3c03b5c2672a863688a6ad986301 SHA256 d116a38ad10292c5ee0c37a04e1ed3cd9436e432d5d6b4128721d168199b4be1 DIST libmikmod-3.1.11-esdm4.patch.bz2 2944 RMD160 8abf8e31a5e3cb9ebee45a04b52ef04024894e25 SHA1 63e03cb0f34d3ece66af2403d9c2d5c463affe7b SHA256 3dc3d413a9c617b919523866768559bee487a240670040f987825305609987da @@ -15,5 +15,5 @@ EBUILD libmikmod-3.1.11-r2.ebuild 1199 RMD160 ff3bc8394e9f1c731bc7bbe351549ade95 EBUILD libmikmod-3.1.11-r4.ebuild 1329 RMD160 6d01a48d87109b899fbcd851e0677ba17fdd7321 SHA1 2058308d2afe935db68db31fd43cf98b6a45e6e1 SHA256 2e5d5a56686e7eefa38c43d540449e6f1f609bf4e5de1eec5b35666dcdd6a44c EBUILD libmikmod-3.1.11-r5.ebuild 1365 RMD160 b691f511712e94159440eb9fdf5fd6332946aa97 SHA1 5301f400e3a56b1ff4b0b2efae281757019cb931 SHA256 9ece9800a367a668b6cc4563dba7308e18865dfda62f276cc122cfc06b57c334 EBUILD libmikmod-3.2.0_beta2.ebuild 1131 RMD160 c143a18c0138e05a6155dca92a128b673704e6df SHA1 bd007be121927d1c60390c92b56a5182a04498de SHA256 2441a964126c194e0833bc93910ec3e50136c98263c0a60dd5bcfd0217fdfbf1 -MISC ChangeLog 7821 RMD160 208e7788edf3d6d2a4dea6be2c3c89f31ad44003 SHA1 f8f09cb3c3b802d2adbc8196e705eadd46304002 SHA256 1edd22ae222838f53f5a3ed1b64526a2348e50325b81df33ffc6fb1853aef416 +MISC ChangeLog 7958 RMD160 30cfd0b11cf6be174016c7d9a62db1935eca8b54 SHA1 f503a069ebc4f1a145a68af7158c03f354a54016 SHA256 9d52734a8b3aeb8428c6d0cad657ca4fff7910ab79982328c2e04236e20aaeb1 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b 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 -- cgit v1.2.3-65-gdbad