* [gentoo-commits] gentoo-x86 commit in net-dns/avahi/files: avahi-0.6.31-fix-locale-build.patch
@ 2014-08-20 17:20 Anthony G. Basile (blueness)
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile (blueness) @ 2014-08-20 17:20 UTC (permalink / raw
To: gentoo-commits
blueness 14/08/20 17:20:13
Added: avahi-0.6.31-fix-locale-build.patch
Log:
Fix bug #501664
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.1 net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch?rev=1.1&content-type=text/plain
Index: avahi-0.6.31-fix-locale-build.patch
===================================================================
avahi-gobject fails to build under et_EE and possibly other locales.
The regex for a sed in avahi-gobject/Makefile fails under various locales.
Forcing LANG=C fixes the issue.
Patch-by: Rafał Mużyło <galtgendo@o2.pl>
X-Gentoo-Bug: 501664
X-Gentoo-Bug-URL: https://bugs.gentoo.org/501664
diff -Naur avahi-0.6.31.orig/avahi-gobject/Makefile.in avahi-0.6.31/avahi-gobject/Makefile.in
--- avahi-0.6.31.orig/avahi-gobject/Makefile.in 2014-08-20 13:10:02.914432590 -0400
+++ avahi-0.6.31/avahi-gobject/Makefile.in 2014-08-20 13:12:09.024436983 -0400
@@ -992,7 +992,7 @@
@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@signals-marshal.list: $(CORE_SOURCES) Makefile.am
@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ $(AM_V_GEN)( cd $(srcdir) && \
-@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
+@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ LANG=C sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ $(CORE_SOURCES) ) \
@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp && \
@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ if cmp -s $@.tmp $@; then \
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-dns/avahi/files: avahi-0.6.31-fix-locale-build.patch
@ 2014-09-07 23:03 Anthony G. Basile (blueness)
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile (blueness) @ 2014-09-07 23:03 UTC (permalink / raw
To: gentoo-commits
blueness 14/09/07 23:03:35
Modified: avahi-0.6.31-fix-locale-build.patch
Log:
Patch Makefile.am, not Makefile.in, bug #501664
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.2 net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch?r1=1.1&r2=1.2
Index: avahi-0.6.31-fix-locale-build.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avahi-0.6.31-fix-locale-build.patch 20 Aug 2014 17:20:13 -0000 1.1
+++ avahi-0.6.31-fix-locale-build.patch 7 Sep 2014 23:03:35 -0000 1.2
@@ -1,22 +1,20 @@
avahi-gobject fails to build under et_EE and possibly other locales.
The regex for a sed in avahi-gobject/Makefile fails under various locales.
-Forcing LANG=C fixes the issue.
-
-Patch-by: Rafał Mużyło <galtgendo@o2.pl>
+Forcing LC_ALL=C fixes the issue.
X-Gentoo-Bug: 501664
X-Gentoo-Bug-URL: https://bugs.gentoo.org/501664
-diff -Naur avahi-0.6.31.orig/avahi-gobject/Makefile.in avahi-0.6.31/avahi-gobject/Makefile.in
---- avahi-0.6.31.orig/avahi-gobject/Makefile.in 2014-08-20 13:10:02.914432590 -0400
-+++ avahi-0.6.31/avahi-gobject/Makefile.in 2014-08-20 13:12:09.024436983 -0400
-@@ -992,7 +992,7 @@
+diff -Naur avahi-0.6.31.orig/avahi-gobject/Makefile.am avahi-0.6.31/avahi-gobject/Makefile.am
+--- avahi-0.6.31.orig/avahi-gobject/Makefile.am 2010-08-25 20:51:39.007153001 -0400
++++ avahi-0.6.31/avahi-gobject/Makefile.am 2014-09-07 19:00:05.485657990 -0400
+@@ -76,7 +76,7 @@
- @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@signals-marshal.list: $(CORE_SOURCES) Makefile.am
- @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ $(AM_V_GEN)( cd $(srcdir) && \
--@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
-+@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ LANG=C sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
- @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ $(CORE_SOURCES) ) \
- @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp && \
- @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ if cmp -s $@.tmp $@; then \
+ signals-marshal.list: $(CORE_SOURCES) Makefile.am
+ $(AM_V_GEN)( cd $(srcdir) && \
+- sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
++ LC_ALL=C sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
+ $(CORE_SOURCES) ) \
+ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp && \
+ if cmp -s $@.tmp $@; then \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-09-07 23:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-20 17:20 [gentoo-commits] gentoo-x86 commit in net-dns/avahi/files: avahi-0.6.31-fix-locale-build.patch Anthony G. Basile (blueness)
-- strict thread matches above, loose matches on Subject: below --
2014-09-07 23:03 Anthony G. Basile (blueness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox