Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
devel:gcc
libgcj46
gcc-dir-version.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gcc-dir-version.patch of Package libgcj46
Index: gcc/Makefile.in =================================================================== *** gcc/Makefile.in.orig 2010-11-05 13:58:02.000000000 +0100 --- gcc/Makefile.in 2010-11-05 14:26:15.000000000 +0100 *************** GTM_H = tm.h $(tm_file_list) in *** 819,830 **** TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H) # Variables for version information. ! BASEVER := $(srcdir)/BASE-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)) DEVPHASE_c := $(shell cat $(DEVPHASE)) DATESTAMP_c := $(shell cat $(DATESTAMP)) --- 819,832 ---- TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H) # Variables for version information. ! 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)) *************** version := $(BASEVER_c) *** 843,848 **** --- 845,851 ---- # (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@\"" *************** gcc-options.o: options.c $(CONFIG_H) $(S *** 2240,2248 **** dumpvers: dumpvers.c ! version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE) $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ ! -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ -DREVISION=$(REVISION_s) \ -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ -DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION) --- 2243,2251 ---- dumpvers: dumpvers.c ! version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE) $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ ! -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 2010-08-27 12:08:41.000000000 +0200 --- libjava/Makefile.am 2010-11-05 14:25:12.000000000 +0100 *************** install_data_local_split = 50 *** 774,780 **** install-data-local: $(PRE_INSTALL) ## Install the .pc file. ! @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ file="libgcj-$${pc_version}.pc"; \ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ --- 774,780 ---- install-data-local: $(PRE_INSTALL) ## Install the .pc file. ! @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 2010-11-05 13:59:46.000000000 +0100 --- libjava/Makefile.in 2010-11-05 14:25:12.000000000 +0100 *************** install-exec-hook: install-binPROGRAMS i *** 12407,12413 **** @BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext) install-data-local: $(PRE_INSTALL) ! @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ file="libgcj-$${pc_version}.pc"; \ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ --- 12407,12413 ---- @BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext) install-data-local: $(PRE_INSTALL) ! @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 2009-12-14 00:18:47.000000000 +0100 --- libjava/testsuite/lib/libjava.exp 2010-11-05 14:25:12.000000000 +0100 *************** proc libjava_init { args } { *** 175,181 **** set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] regexp " version \[^\n\r\]*" $text version ! set libjava_version [lindex $version 1] verbose "version: $libjava_version" --- 175,181 ---- set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] regexp " version \[^\n\r\]*" $text version ! set libjava_version 4.6 verbose "version: $libjava_version"
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor