[gentoo-commits] gentoo-x86 commit in media-sound/xmms2-scrobbler/files: xmms2-scrobbler-0.4.0-ld-order.patch xmms2-scrobbler-0.4.0-libs.patch xmms2-scrobbler-0.4.0-ldflags.patch

[gentoo-commits] gentoo-x86 commit in media-sound/xmms2-scrobbler/files: xmms2-scrobbler-0.4.0-ld-order.patch xmms2-scrobbler-0.4.0-libs.patch xmms2-scrobbler-0.4.0-ldflags.patch

[Sergei Trofimovich (slyfox)]

slyfox      12/03/03 17:49:34

  Added:                xmms2-scrobbler-0.4.0-ld-order.patch
                        xmms2-scrobbler-0.4.0-libs.patch
                        xmms2-scrobbler-0.4.0-ldflags.patch
  Log:
  Initial ebuild by Alexander Tsoy  (bug #341939). I slightly cleaned it and added --as-needed fixes.
  
  (Portage version: 2.2.0_alpha89_p3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch?rev=1.1&content-type=text/plain

Index: xmms2-scrobbler-0.4.0-ld-order.patch
===================================================================
commit 096ee717070bdde9c1adc29f02fcb537920daca9
Author: Sergei Trofimovich <slyfox@gentoo.org>
Date:   Sat Mar 3 20:24:21 2012 +0300

    Makefile: set proper link order for libraries
    
    '-Wl,--as-needed' enforces libraries to go in proper dependency order:
    
        $ x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -Wl,--hash-style=gnu `pkg-config xmms2-client --libs` `pkg-config libcurl --libs` src/xmms2-scrobbler.o src/list.o src/queue.o src/strbuf.o src/md5.o src/submission.o -o bin/xmms2-scrobbler
        src/xmms2-scrobbler.o: In function `save_profile_submissions_queue':
        xmms2-scrobbler.c:(.text+0x281): undefined reference to `xmmsc_userconfdir_get'
        src/xmms2-scrobbler.o: In function `load_config':
        xmms2-scrobbler.c:(.text+0x3e2): undefined reference to `xmmsc_userconfdir_get'
        src/xmms2-scrobbler.o: In function `maybe_submit_to_profile':
        xmms2-scrobbler.c:(.text+0x7e3): undefined reference to `xmmsc_medialib_get_info'
        xmms2-scrobbler.c:(.text+0x7f7): undefined reference to `xmmsc_result_notifier_set'
    
    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

diff --git a/Makefile b/Makefile
index 7693bd2..4207cda 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ install: $(BINARY)
 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
 
 $(BINARY): $(OBJECTS) bin
-	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@ $(LIBS)
+	$(QUIET_LINK)$(CC) $(OBJECTS) -o $@ $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(LIBS)
 
 src/%.o : src/%.c
 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<



1.1                  media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch?rev=1.1&content-type=text/plain

Index: xmms2-scrobbler-0.4.0-libs.patch
===================================================================
diff --git a/Makefile b/Makefile
index 3331e30..7693bd2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 CFLAGS += -std=gnu99 -Wall -Wwrite-strings -pthread
+LIBS = -lrt -lpthread
 ENDIAN_CFLAGS=
 PREFIX ?= /usr/local
 
@@ -35,7 +36,7 @@ install: $(BINARY)
 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
 
 $(BINARY): $(OBJECTS) bin
-	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@
+	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@ $(LIBS)
 
 src/%.o : src/%.c
 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<



1.1                  media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch?rev=1.1&content-type=text/plain

Index: xmms2-scrobbler-0.4.0-ldflags.patch
===================================================================
commit 8b97319c1a03acecc21b5608516859daaf5bca75
Author: James Le Cuirot <chewi@aura-online.co.uk>
Date:   Fri Mar 26 20:10:54 2010 +0100

    Fixed the build if the --as-needed linker option is enabled.

diff --git a/Makefile b/Makefile
index dad3fcb..3331e30 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ install: $(BINARY)
 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
 
 $(BINARY): $(OBJECTS) bin
-	$(QUIET_LINK)$(CC) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(OBJECTS) -o $@
+	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@
 
 src/%.o : src/%.c
 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<