summaryrefslogtreecommitdiff
path: root/debian/patches/gcc-textdomain.diff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2019-11-18 15:53:29 +0300
committerIgor Pashev <pashev.igor@gmail.com>2019-11-18 15:53:29 +0300
commit8f6c4b0033c72f8ac14694c419a99458339dd6a9 (patch)
tree06c106e622a58100aa85a381b9b65d222b076df4 /debian/patches/gcc-textdomain.diff
parent42156b5190f4fa150e1fab6777eb81e69d4db8c9 (diff)
downloadgcc-9-debian.tar.gz
Import gcc-9 (9.2.1-19)debian/9.2.1-19debian
Diffstat (limited to 'debian/patches/gcc-textdomain.diff')
-rw-r--r--debian/patches/gcc-textdomain.diff26
1 files changed, 8 insertions, 18 deletions
diff --git a/debian/patches/gcc-textdomain.diff b/debian/patches/gcc-textdomain.diff
index c7dadf3..dc2b0b0 100644
--- a/debian/patches/gcc-textdomain.diff
+++ b/debian/patches/gcc-textdomain.diff
@@ -1,7 +1,5 @@
# DP: Set gettext's domain and textdomain to the versioned package name.
-Index: b/src/gcc/intl.c
-===================================================================
--- a/src/gcc/intl.c
+++ b/src/gcc/intl.c
@@ -55,8 +55,8 @@ gcc_init_libintl (void)
@@ -10,31 +8,27 @@ Index: b/src/gcc/intl.c
- (void) bindtextdomain ("gcc", LOCALEDIR);
- (void) textdomain ("gcc");
-+ (void) bindtextdomain ("gcc-6", LOCALEDIR);
-+ (void) textdomain ("gcc-6");
++ (void) bindtextdomain ("gcc-9", LOCALEDIR);
++ (void) textdomain ("gcc-9");
/* Opening quotation mark. */
open_quote = _("`");
-Index: b/src/gcc/Makefile.in
-===================================================================
--- a/src/gcc/Makefile.in
+++ b/src/gcc/Makefile.in
-@@ -3995,8 +3995,8 @@ install-po:
+@@ -4199,8 +4199,8 @@ install-po:
dir=$(localedir)/$$lang/LC_MESSAGES; \
echo $(mkinstalldirs) $(DESTDIR)$$dir; \
$(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
- echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \
- $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \
-+ echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-6.mo; \
-+ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-6.mo; \
++ echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-9.mo; \
++ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-9.mo; \
done
# Rule for regenerating the message template (gcc.pot).
-Index: b/src/libcpp/init.c
-===================================================================
--- a/src/libcpp/init.c
+++ b/src/libcpp/init.c
-@@ -155,7 +155,7 @@ init_library (void)
+@@ -163,7 +163,7 @@ init_library (void)
init_trigraph_map ();
#ifdef ENABLE_NLS
@@ -43,11 +37,9 @@ Index: b/src/libcpp/init.c
#endif
}
}
-Index: b/src/libcpp/system.h
-===================================================================
--- a/src/libcpp/system.h
+++ b/src/libcpp/system.h
-@@ -280,7 +280,7 @@ extern int errno;
+@@ -284,7 +284,7 @@ extern int errno;
#endif
#ifndef _
@@ -56,15 +48,13 @@ Index: b/src/libcpp/system.h
#endif
#ifndef N_
-Index: b/src/libcpp/Makefile.in
-===================================================================
--- a/src/libcpp/Makefile.in
+++ b/src/libcpp/Makefile.in
@@ -49,6 +49,7 @@ LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
PACKAGE = @PACKAGE@
-+PACKAGE_SUFFIX = -6
++PACKAGE_SUFFIX = -9
RANLIB = @RANLIB@
SHELL = @SHELL@
USED_CATALOGS = @USED_CATALOGS@