* [gentoo-commits] gentoo-x86 commit in media-sound/alsa-tools/files: alsa-tools-1.0.18-asneeded.patch
@ 2008-11-13 0:00 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2008-11-13 0:00 UTC (permalink / raw
To: gentoo-commits
flameeyes 08/11/13 00:00:15
Added: alsa-tools-1.0.18-asneeded.patch
Log:
Update --as-needed patch that was broken with the bump.
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Revision Changes Path
1.1 media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch?rev=1.1&content-type=text/plain
Index: alsa-tools-1.0.18-asneeded.patch
===================================================================
Index: alsa-tools-1.0.18/echomixer/Makefile.am
===================================================================
--- alsa-tools-1.0.18.orig/echomixer/Makefile.am
+++ alsa-tools-1.0.18/echomixer/Makefile.am
@@ -2,7 +2,7 @@ AM_CFLAGS = @ECHOMIXER_CFLAGS@
bin_PROGRAMS = echomixer
man_MANS =
echomixer_SOURCES = echomixer.c
-echomixer_LDFLAGS = @ECHOMIXER_LIBS@
+echomixer_LDADD = @ECHOMIXER_LIBS@
EXTRA_DIST = gitcompile configure.in-gtk1 configure.in-gtk2
AUTOMAKE_OPTIONS = foreign
Index: alsa-tools-1.0.18/envy24control/Makefile.am
===================================================================
--- alsa-tools-1.0.18.orig/envy24control/Makefile.am
+++ alsa-tools-1.0.18/envy24control/Makefile.am
@@ -4,7 +4,7 @@ man_MANS = envy24control.1
envy24control_SOURCES = envy24control.c envy24control.h levelmeters.c midi.c \
mixer.c patchbay.c hardware.c driverevents.c volume.c \
profiles.c profiles.h midi.h config.c config.h
-envy24control_LDFLAGS = @ENVY24CONTROL_LIBS@
+envy24control_LDADD = @ENVY24CONTROL_LIBS@
EXTRA_DIST = gitcompile envy24control.1 depcomp configure.in-gtk1 \
configure.in-gtk2 strstr_icase_blank.c new_process.c \
README.profiles
Index: alsa-tools-1.0.18/rmedigicontrol/Makefile.am
===================================================================
--- alsa-tools-1.0.18.orig/rmedigicontrol/Makefile.am
+++ alsa-tools-1.0.18/rmedigicontrol/Makefile.am
@@ -2,7 +2,7 @@ AM_CFLAGS = @RMEDIGICONTROL_CFLAGS@
bin_PROGRAMS = rmedigicontrol
rmedigicontrol_SOURCES = rmedigicontrol.c rmedigicontrol.h level.c loopback.c
-rmedigicontrol_LDFLAGS = @RMEDIGICONTROL_LIBS@
+rmedigicontrol_LDADD = @RMEDIGICONTROL_LIBS@
EXTRA_DIST = gitcompile depcomp configure.in-gtk1 configure.in-gtk2
AUTOMAKE_OPTIONS = foreign
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/alsa-tools/files: alsa-tools-1.0.18-asneeded.patch
@ 2008-11-14 3:33 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2008-11-14 3:33 UTC (permalink / raw
To: gentoo-commits
flameeyes 08/11/14 03:33:32
Modified: alsa-tools-1.0.18-asneeded.patch
Log:
Replace the asneeded patches for 1.0.18 with the one that has been applied upstream, so that we don't diverge from upstream.
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Revision Changes Path
1.2 media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch?r1=1.1&r2=1.2
Index: alsa-tools-1.0.18-asneeded.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-tools-1.0.18-asneeded.patch 13 Nov 2008 00:00:15 -0000 1.1
+++ alsa-tools-1.0.18-asneeded.patch 14 Nov 2008 03:33:32 -0000 1.2
@@ -1,7 +1,27 @@
-Index: alsa-tools-1.0.18/echomixer/Makefile.am
-===================================================================
---- alsa-tools-1.0.18.orig/echomixer/Makefile.am
-+++ alsa-tools-1.0.18/echomixer/Makefile.am
+From 56970e8143b4d171a118d114b1ddfa7621401127 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Diego=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Thu, 13 Nov 2008 13:13:53 +0100
+Subject: [PATCH] Fix building of alsa-tools when using the --as-needed linker option.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+Please note that LDFLAGS is the _wrong_ variable to pass libraries
+with, automake tells you to use _LDADD for binaries and _LIBADD for
+libraries, while autoconf wants them in the LIBS variable.
+
+Signed-off-by: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
+---
+ echomixer/Makefile.am | 2 +-
+ envy24control/Makefile.am | 2 +-
+ hdspmixer/configure.in | 2 +-
+ rmedigicontrol/Makefile.am | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/echomixer/Makefile.am b/echomixer/Makefile.am
+index a9dfaf0..1af72c0 100644
+--- a/echomixer/Makefile.am
++++ b/echomixer/Makefile.am
@@ -2,7 +2,7 @@ AM_CFLAGS = @ECHOMIXER_CFLAGS@
bin_PROGRAMS = echomixer
man_MANS =
@@ -11,10 +31,10 @@
EXTRA_DIST = gitcompile configure.in-gtk1 configure.in-gtk2
AUTOMAKE_OPTIONS = foreign
-Index: alsa-tools-1.0.18/envy24control/Makefile.am
-===================================================================
---- alsa-tools-1.0.18.orig/envy24control/Makefile.am
-+++ alsa-tools-1.0.18/envy24control/Makefile.am
+diff --git a/envy24control/Makefile.am b/envy24control/Makefile.am
+index 72fe707..e29c408 100644
+--- a/envy24control/Makefile.am
++++ b/envy24control/Makefile.am
@@ -4,7 +4,7 @@ man_MANS = envy24control.1
envy24control_SOURCES = envy24control.c envy24control.h levelmeters.c midi.c \
mixer.c patchbay.c hardware.c driverevents.c volume.c \
@@ -24,10 +44,22 @@
EXTRA_DIST = gitcompile envy24control.1 depcomp configure.in-gtk1 \
configure.in-gtk2 strstr_icase_blank.c new_process.c \
README.profiles
-Index: alsa-tools-1.0.18/rmedigicontrol/Makefile.am
-===================================================================
---- alsa-tools-1.0.18.orig/rmedigicontrol/Makefile.am
-+++ alsa-tools-1.0.18/rmedigicontrol/Makefile.am
+diff --git a/hdspmixer/configure.in b/hdspmixer/configure.in
+index 6fb5abe..8f2c498 100644
+--- a/hdspmixer/configure.in
++++ b/hdspmixer/configure.in
+@@ -36,6 +36,6 @@ FLTK_CXXFLAGS="`$FLTK_CONFIG --cxxflags` -fno-exceptions"
+ FLTK_LIBS="`$FLTK_CONFIG --ldflags`"
+
+ CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS"
+-LDFLAGS="$LDFLAGS $ALSA_LIBS $FLTK_LIBS"
++LIBS="$LIBS $ALSA_LIBS $FLTK_LIBS"
+
+ AC_OUTPUT(Makefile src/Makefile pixmaps/Makefile)
+diff --git a/rmedigicontrol/Makefile.am b/rmedigicontrol/Makefile.am
+index 88e9a3f..bf24c5c 100644
+--- a/rmedigicontrol/Makefile.am
++++ b/rmedigicontrol/Makefile.am
@@ -2,7 +2,7 @@ AM_CFLAGS = @RMEDIGICONTROL_CFLAGS@
bin_PROGRAMS = rmedigicontrol
rmedigicontrol_SOURCES = rmedigicontrol.c rmedigicontrol.h level.c loopback.c
@@ -37,3 +69,6 @@
EXTRA_DIST = gitcompile depcomp configure.in-gtk1 configure.in-gtk2
AUTOMAKE_OPTIONS = foreign
+--
+1.6.0.3
+
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/alsa-tools/files: alsa-tools-1.0.18-asneeded.patch
@ 2009-08-21 15:43 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-08-21 15:43 UTC (permalink / raw
To: gentoo-commits
ssuominen 09/08/21 15:43:25
Removed: alsa-tools-1.0.18-asneeded.patch
Log:
old
(Portage version: 2.2_rc38/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-08-21 15:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-21 15:43 [gentoo-commits] gentoo-x86 commit in media-sound/alsa-tools/files: alsa-tools-1.0.18-asneeded.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2008-11-14 3:33 Diego Petteno (flameeyes)
2008-11-13 0:00 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox