File gcc-dir-version.patch of Package gcc43
Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in.orig 2009-05-26 12:15:16.000000000 +0200
+++ gcc/Makefile.in 2009-11-20 13:50:02.000000000 +0100
@@ -747,12 +747,14 @@ GTM_H = tm.h $(tm_file_list)
TM_H = $(GTM_H) insn-constants.h insn-flags.h options.h
# Variables for version information.
-BASEVER := $(srcdir)/BASE-VER # 4.x.y
+BASEVER := $(srcdir)/BASE-VER # 4.x
+FULLVER := $(srcdir)/FULL-VER # 4.x.y
DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, ""
DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty
REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX]
BASEVER_c := $(shell cat $(BASEVER))
+FULLVER_c := $(shell cat $(FULLVER))
DEVPHASE_c := $(shell cat $(DEVPHASE))
DATESTAMP_c := $(shell cat $(DATESTAMP))
@@ -770,6 +772,7 @@ version := $(BASEVER_c)
# (i.e. if DEVPHASE_c is empty). The space immediately after the
# comma in the $(if ...) constructs is significant - do not remove it.
BASEVER_s := "\"$(BASEVER_c)\""
+FULLVER_s := "\"$(FULLVER_c)\""
DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
PKGVERSION_s:= "\"@PKGVERSION@\""
@@ -1933,12 +1936,12 @@ gcc-options.o: options.c $(CONFIG_H) $(S
dumpvers: dumpvers.c
ifdef REVISION_s
-version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)
+version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)
else
-version.o: version.c version.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)
+version.o: version.c version.h $(DATESTAMP) $(FULLVER) $(DEVPHASE)
endif
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
- -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
+ -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \
-DREVISION=$(REVISION_s) \
-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
-DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION)
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am.orig 2009-06-25 11:55:13.000000000 +0200
+++ libjava/Makefile.am 2009-11-20 13:50:02.000000000 +0100
@@ -481,7 +481,7 @@ endif BUILD_ECJ1
install-data-local:
$(PRE_INSTALL)
## Install the .pc file.
- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
+ @pc_version=`echo $(GCJVERSION)`; \
file="libgcj-$${pc_version}.pc"; \
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
Index: libjava/Makefile.in
===================================================================
--- libjava/Makefile.in.orig 2009-07-14 12:35:52.000000000 +0200
+++ libjava/Makefile.in 2009-11-20 13:50:02.000000000 +0100
@@ -11891,7 +11891,7 @@ install-exec-hook: install-binPROGRAMS i
install-data-local:
$(PRE_INSTALL)
- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
+ @pc_version=`echo $(GCJVERSION)`; \
file="libgcj-$${pc_version}.pc"; \
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
Index: libjava/testsuite/lib/libjava.exp
===================================================================
--- libjava/testsuite/lib/libjava.exp.orig 2008-03-05 21:46:42.000000000 +0100
+++ libjava/testsuite/lib/libjava.exp 2009-11-20 13:50:02.000000000 +0100
@@ -168,7 +168,7 @@ proc libjava_init { args } {
set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
regexp " version \[^\n\r\]*" $text version
- set libjava_version [lindex $version 1]
+ set libjava_version 4.3
verbose "version: $libjava_version"