From ee2cd97f5c1512dc05510d32c0e430ef31e7a442af4cb74cf82463ba21d0bcf0 Mon Sep 17 00:00:00 2001 From: Cristian Morales Vega Date: Wed, 7 May 2014 14:43:14 +0000 Subject: [PATCH] - Modify libmikmod-config.patch to also remove pthreads stuff from cflags and ldadd. Now it's "equivalent" to the .pc file. - Add libmikmod-config.patch: Remove @LIBRARY_LIB@ from libmikmod-config, which is only needed for OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmikmod?expand=0&rev=27 --- libmikmod-config.patch | 20 ++++++++++++++------ libmikmod.changes | 9 ++++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/libmikmod-config.patch b/libmikmod-config.patch index 20552a2..de61b93 100644 --- a/libmikmod-config.patch +++ b/libmikmod-config.patch @@ -1,13 +1,21 @@ -Index: libmikmod-3.3.6/libmikmod-config.in +Index: libmikmod-config.in =================================================================== ---- libmikmod-3.3.6.orig/libmikmod-config.in -+++ libmikmod-3.3.6/libmikmod-config.in -@@ -50,7 +50,7 @@ while test $# -gt 0 ; do - echo @LIB_LDADD@ +--- libmikmod-config.in.orig ++++ libmikmod-config.in +@@ -44,13 +44,13 @@ while test $# -gt 0 ; do + if test $includedir != /usr/include ; then + includes=-I$includedir + fi +- echo $includes @REENTRANT@ ++ echo $includes + ;; + --ldadd) +- echo @LIB_LDADD@ ++ echo ;; --libs) - echo -L@libdir@ -lmikmod @LIBRARY_LIB@ -+ echo -L@libdir@ -lmikmod ++ echo -lmikmod ;; *) echo "${usage}" 1>&2 diff --git a/libmikmod.changes b/libmikmod.changes index 538c11d..e46d1e3 100644 --- a/libmikmod.changes +++ b/libmikmod.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Wed May 7 14:41:18 UTC 2014 - reddwarf@opensuse.org + +- Modify libmikmod-config.patch to also remove pthreads stuff from + cflags and ldadd. Now it's "equivalent" to the .pc file. + ------------------------------------------------------------------- Tue May 6 09:22:13 UTC 2014 - schwab@suse.de -- Remove @LIBRARY_LIB@ from libmikmod-config, which is only needed for +- Add libmikmod-config.patch: + Remove @LIBRARY_LIB@ from libmikmod-config, which is only needed for static linking, which is not possible anyway -------------------------------------------------------------------