diff options
author | Koen Kooi <koen@openembedded.org> | 2008-06-10 22:05:00 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2008-06-10 22:05:00 +0000 |
commit | 8993f246c593e78038f7422c24897bfd16348945 (patch) | |
tree | b4a9ca8f6b8aade32e15e5e56b23d647442b744f /packages/gcc/gcc-4.3.1/debian/gcc-textdomain.dpatch | |
parent | 0985e00d9608d3f197772046763e03a00a72cd5e (diff) |
gcc 4.3.0: replace with gcc 4.3.1
Diffstat (limited to 'packages/gcc/gcc-4.3.1/debian/gcc-textdomain.dpatch')
-rw-r--r-- | packages/gcc/gcc-4.3.1/debian/gcc-textdomain.dpatch | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/packages/gcc/gcc-4.3.1/debian/gcc-textdomain.dpatch b/packages/gcc/gcc-4.3.1/debian/gcc-textdomain.dpatch new file mode 100644 index 0000000000..6315a19de5 --- /dev/null +++ b/packages/gcc/gcc-4.3.1/debian/gcc-textdomain.dpatch @@ -0,0 +1,103 @@ +#! /bin/sh -e + +# DP: Set gettext's domain and textdomain to the versioned package name. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + + +--- gcc/Makefile.in.orig 2005-09-04 23:32:54.003440040 +0000 ++++ gcc/Makefile.in 2005-09-04 23:40:10.954013456 +0000 +@@ -4565,8 +4565,8 @@ + 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-4.3.mo; \ ++ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-4.3.mo; \ + done + + # Rule for regenerating the message template (gcc.pot). +--- gcc/intl.c.orig 2005-09-04 23:32:54.006439584 +0000 ++++ gcc/intl.c 2005-09-04 23:36:37.933397512 +0000 +@@ -51,8 +51,8 @@ + setlocale (LC_ALL, ""); + #endif + +- (void) bindtextdomain ("gcc", LOCALEDIR); +- (void) textdomain ("gcc"); ++ (void) bindtextdomain ("gcc-4.3", LOCALEDIR); ++ (void) textdomain ("gcc-4.3"); + + /* Opening quotation mark. */ + open_quote = _("`"); +--- libcpp/Makefile.in.orig 2005-09-04 23:32:54.009439128 +0000 ++++ libcpp/Makefile.in 2005-09-04 23:33:24.607787472 +0000 +@@ -47,6 +47,7 @@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ + PACKAGE = @PACKAGE@ ++PACKAGE_SUFFIX = -4.3 + RANLIB = @RANLIB@ + SHELL = @SHELL@ + USED_CATALOGS = @USED_CATALOGS@ +@@ -66,6 +67,7 @@ + + INCLUDES = -I$(srcdir) -I. -I$(srcdir)/../include @INCINTL@ \ + -I$(srcdir)/include ++CPPFLAGS += -DPACKAGE_SUFFIX=\"$(strip $(PACKAGE_SUFFIX))\" + + ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) + +@@ -156,8 +158,8 @@ + else continue; \ + fi; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ +- $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ ++ echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \ ++ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \ + done + + mostlyclean: +--- libcpp/system.h.orig 2005-09-04 23:32:54.006439584 +0000 ++++ libcpp/system.h 2005-09-04 23:33:24.606787624 +0000 +@@ -260,7 +260,7 @@ + #endif + + #ifndef _ +-# define _(msgid) dgettext (PACKAGE, msgid) ++# define _(msgid) dgettext (PACKAGE PACKAGE_SUFFIX, msgid) + #endif + + #ifndef N_ +--- libcpp/init.c.orig 2005-09-04 23:32:54.008439280 +0000 ++++ libcpp/init.c 2005-09-04 23:33:24.607787472 +0000 +@@ -122,7 +122,7 @@ + init_trigraph_map (); + + #ifdef ENABLE_NLS +- (void) bindtextdomain (PACKAGE, LOCALEDIR); ++ (void) bindtextdomain (PACKAGE PACKAGE_SUFFIX, LOCALEDIR); + #endif + } + } |