From: <lin...@us...> - 2010-06-15 18:50:35
|
Revision: 7438 http://octave.svn.sourceforge.net/octave/?rev=7438&view=rev Author: lindnerb Date: 2010-06-15 18:50:29 +0000 (Tue, 15 Jun 2010) Log Message: ----------- mingw64: fix cross-gcc makefile 2010-Jun-15 Benjamin Lindner <lin...@us...> * build/makefile (strip-exe): use mingw32's strip, not the built one, since the cross-compiler is win32-hosted, but not necessarily win32-targetted Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2010-06-15 13:03:10 UTC (rev 7437) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2010-06-15 18:50:29 UTC (rev 7438) @@ -1,3 +1,9 @@ +2010-Jun-15 Benjamin Lindner <lin...@us...> + + * build/makefile (strip-exe): use mingw32's strip, not the built one, + since the cross-compiler is win32-hosted, but not necessarily + win32-targetted + 2010-Jun-14 Benjamin Lindner <lin...@us...> * initial import Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2010-06-15 13:03:10 UTC (rev 7437) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2010-06-15 18:50:29 UTC (rev 7438) @@ -633,10 +633,8 @@ gcc-install strip-exe : - cp -av $(PREFIX)/bin/$(TARGET_ARCH)-strip.exe $(PREFIX)/bin/tmp-strip.exe find $(PREFIX) -iname '*.exe' \ - -print -exec $(PREFIX)/bin/tmp-strip.exe --strip-unneeded '{}' \; - rm $(PREFIX)/bin/tmp-strip.exe + -print -exec strip.exe --strip-unneeded '{}' \; dist : cd $(PREFIX) && $(TAR) c --exclude '*.marker' * | lzma -czv7 > $(CURDIR)/$(TARGET_ARCH)_gcc-$(GCC_BRANCH)_`date "+%Y%m%d"`.tar.lzma This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-07-29 19:22:20
|
Revision: 7489 http://octave.svn.sourceforge.net/octave/?rev=7489&view=rev Author: lindnerb Date: 2010-07-29 19:22:11 +0000 (Thu, 29 Jul 2010) Log Message: ----------- mingw64: update msys installer 2010-Jul-29 Benjamin Lindner <lin...@us...> * msysinstaller/install.cmd (msysCORE-bin): update to 1.0.15 (msysCORE-ext): add new archive (binutils): update to 2.20.51 (svn): update to 1.6.12, use new download site Ensure subdirectory mingw/ is created before installing mingw32-gcc Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/msysinstaller/install.cmd Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2010-07-28 10:30:13 UTC (rev 7488) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2010-07-29 19:22:11 UTC (rev 7489) @@ -1,3 +1,11 @@ +2010-Jul-29 Benjamin Lindner <lin...@us...> + + * msysinstaller/install.cmd (msysCORE-bin): update to 1.0.15 + (msysCORE-ext): add new archive + (binutils): update to 2.20.51 + (svn): update to 1.6.12, use new download site + Ensure subdirectory mingw/ is created before installing mingw32-gcc + 2010-Jun-15 Benjamin Lindner <lin...@us...> * build/makefile (strip-exe): use mingw32's strip, not the built one, Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/msysinstaller/install.cmd =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/msysinstaller/install.cmd 2010-07-28 10:30:13 UTC (rev 7488) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/msysinstaller/install.cmd 2010-07-29 19:22:11 UTC (rev 7489) @@ -74,7 +74,8 @@ rem rem Download and install rem -call :msysinstall msysCORE-1.0.14-1-msys-1.0.14-bin.tar.lzma +call :msysinstall msysCORE-1.0.15-1-msys-1.0.15-bin.tar.lzma +call :msysinstall msysCORE-1.0.15-1-msys-1.0.15-ext.tar.lzma call :msysinstall libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma call :msysinstall libcharset-1.13.1-2-msys-1.0.13-dll-1.tar.lzma call :msysinstall libintl-0.17-2-msys-dll-8.tar.lzma @@ -112,6 +113,7 @@ call :msysinstall texinfo-4.13a-2-msys-1.0.13-bin.tar.lzma +mkdir "%DST%\mingw" call :mingwinstall gcc-core-4.5.0-1-mingw32-bin.tar.lzma call :mingwinstall gcc-c++-4.5.0-1-mingw32-bin.tar.lzma call :mingwinstall libgcc-4.5.0-1-mingw32-dll-1.tar.lzma @@ -119,7 +121,7 @@ call :mingwinstall libgmp-5.0.1-1-mingw32-dll-10.tar.lzma call :mingwinstall libmpfr-2.4.1-1-mingw32-dll-1.tar.lzma call :mingwinstall libmpc-0.8.1-1-mingw32-dll-2.tar.lzma -call :mingwinstall binutils-2.20.1-2-mingw32-bin.tar.gz +call :mingwinstall binutils-2.20.51-1-mingw32-bin.tar.lzma call :mingwinstall mingwrt-3.18-mingw32-dll.tar.gz call :mingwinstall mingwrt-3.18-mingw32-dev.tar.gz call :mingwinstall w32api-3.14-mingw32-dev.tar.gz @@ -128,7 +130,7 @@ call :install junction.zip http://download.sysinternals.com/Files/junction.zip \local\bin mkdir "%DST%\mingw" -call :install svn-win32-1.6.6.zip http://subversion.tigris.org/files/documents/15/46880/svn-win32-1.6.6.zip \mingw "--strip-components=1" +call :install svn-win32-1.6.12.zip http://alagazam.net/svn-1.6.12/svn-win32-1.6.12.zip \mingw "--strip-components=1" call :download wget.exe "http://users.ugent.be/~bpuype/cgi-bin/fetch.pl?dl=wget/wget.exe" echo wget.exe... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-07-29 20:27:49
|
Revision: 7490 http://octave.svn.sourceforge.net/octave/?rev=7490&view=rev Author: lindnerb Date: 2010-07-29 20:27:42 +0000 (Thu, 29 Jul 2010) Log Message: ----------- mingw64: add dos2unix to mingw installer 2010-Jul-29 Benjamin Lindner <lin...@us...> * msysinstaller/install.cmd (cygutils-dos2unix): new archive (libpopt): new archive Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/msysinstaller/install.cmd Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2010-07-29 19:22:11 UTC (rev 7489) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2010-07-29 20:27:42 UTC (rev 7490) @@ -1,5 +1,10 @@ 2010-Jul-29 Benjamin Lindner <lin...@us...> + * msysinstaller/install.cmd (cygutils-dos2unix): new archive + (libpopt): new archive + +2010-Jul-29 Benjamin Lindner <lin...@us...> + * msysinstaller/install.cmd (msysCORE-bin): update to 1.0.15 (msysCORE-ext): add new archive (binutils): update to 2.20.51 Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/msysinstaller/install.cmd =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/msysinstaller/install.cmd 2010-07-29 19:22:11 UTC (rev 7489) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/msysinstaller/install.cmd 2010-07-29 20:27:42 UTC (rev 7490) @@ -113,6 +113,9 @@ call :msysinstall texinfo-4.13a-2-msys-1.0.13-bin.tar.lzma +call :msysinstall cygutils-dos2unix-1.3.4-4-msys-1.0.13-bin.tar.lzma +call :msysinstall libpopt-1.15-2-msys-1.0.13-dll-0.tar.lzma + mkdir "%DST%\mingw" call :mingwinstall gcc-core-4.5.0-1-mingw32-bin.tar.lzma call :mingwinstall gcc-c++-4.5.0-1-mingw32-bin.tar.lzma This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-07-29 20:32:24
|
Revision: 7491 http://octave.svn.sourceforge.net/octave/?rev=7491&view=rev Author: lindnerb Date: 2010-07-29 20:32:18 +0000 (Thu, 29 Jul 2010) Log Message: ----------- mingw64: fixes in crossgcc build 2010-Jul-29 Benjamin Lindner <lin...@us...> * build/makefile (gcc-bootstrap-compile): fix build error due to line endings mismatch (gcc-libgcc-install): move libgcc_s.a to correct location Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2010-07-29 20:27:42 UTC (rev 7490) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2010-07-29 20:32:18 UTC (rev 7491) @@ -1,5 +1,11 @@ 2010-Jul-29 Benjamin Lindner <lin...@us...> + * build/makefile (gcc-bootstrap-compile): fix build error due to line + endings mismatch + (gcc-libgcc-install): move libgcc_s.a to correct location + +2010-Jul-29 Benjamin Lindner <lin...@us...> + * msysinstaller/install.cmd (cygutils-dos2unix): new archive (libpopt): new archive Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2010-07-29 20:27:42 UTC (rev 7490) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2010-07-29 20:32:18 UTC (rev 7491) @@ -389,6 +389,7 @@ # -------------------------------------- gcc-bootstrap-compile : $(BUILD_DIR)/gcc/.bootstrap.compile.marker $(BUILD_DIR)/gcc/.bootstrap.compile.marker : $(BUILD_DIR)/gcc/.config.marker + u2d $(SRC_DIR)/gcc/gcc/doc/tm.texi $(SRC_DIR)/gcc/gcc/doc/tm.texi.in $(MAKE) -C $(dir $@) $(MAKE_PARALLEL) all-gcc touch $@ @@ -447,6 +448,8 @@ gcc-libgcc-install : $(BUILD_DIR)/gcc/.libgcc.install.marker $(BUILD_DIR)/gcc/.libgcc.install.marker : $(BUILD_DIR)/gcc/.libgcc.build.marker $(MAKE) -C $(dir $@) install-target-libgcc + cp -av $(PREFIX)/lib/gcc/$(TARGET_ARCH)/lib/libgcc_s.a $(PREFIX)/lib/gcc/$(TARGET_ARCH)/`cat $(SRC_DIR)/gcc/gcc/BASE-VER` + rm -f $(PREFIX)/lib/gcc/$(TARGET_ARCH)/lib/libgcc_s.a touch $@ gcc-libgcc-all : \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2010-10-23 15:19:28
|
Revision: 7868 http://octave.svn.sourceforge.net/octave/?rev=7868&view=rev Author: lindnerb Date: 2010-10-23 15:19:22 +0000 (Sat, 23 Oct 2010) Log Message: ----------- mingw64: update crossgcc build 2010-Oct-23 Benjamin Lindner <lin...@us...> * build/makefile (GCC_CONFIG_ARGS): add --disable-lto (PTHREADS_CVS_PULL): new variable (PTHREADS_CVS_DATE): ... likewise. (gcc-update): avoid conflicts (gcc-configure): fix typo (pthreads-download): use cvs date (pthreads-update): ... likewise (dist): add .zip archive (mostly-clean): new target (dist-clean): ... likewise. Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2010-10-22 18:32:54 UTC (rev 7867) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2010-10-23 15:19:22 UTC (rev 7868) @@ -1,3 +1,16 @@ +2010-Oct-23 Benjamin Lindner <lin...@us...> + + * build/makefile (GCC_CONFIG_ARGS): add --disable-lto + (PTHREADS_CVS_PULL): new variable + (PTHREADS_CVS_DATE): ... likewise. + (gcc-update): avoid conflicts + (gcc-configure): fix typo + (pthreads-download): use cvs date + (pthreads-update): ... likewise + (dist): add .zip archive + (mostly-clean): new target + (dist-clean): ... likewise. + 2010-Jul-29 Benjamin Lindner <lin...@us...> * build/makefile (gcc-bootstrap-compile): fix build error due to line Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2010-10-22 18:32:54 UTC (rev 7867) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2010-10-23 15:19:22 UTC (rev 7868) @@ -73,6 +73,11 @@ PREFIX=$(CURDIR)/$(INSTALL_DIR) +# -------------------------------------- +# Download URLs +# -------------------------------------- +PTHREADS_CVS_PULL ?= :pserver:an...@so...:/cvs/pthreads-win32 +PTHREADS_CVS_DATE ?= '5/11/2010' # -------------------------------------- # DO NOT EDIT BELOW THIS LINE @@ -89,7 +94,8 @@ --with-dwarf2 \ --enable-version-specific-runtime-libs \ --disable-win32-registry \ ---disable-nls +--disable-nls \ +--disable-lto CRT_CONFIG_ARGS = CPPFLAGS=-D__MINGW_SHOW_INVALID_PARAMETER_EXCEPTION # -------------------------------------- @@ -357,6 +363,8 @@ .PHONY: $(SRC_DIR)/gcc/.update.marker else $(SRC_DIR)/gcc/.update.marker : $(SRC_DIR)/gcc/.co.marker + cd $(dir $@) && $(SVN) revert gcc/doc/tm.texi + cd $(dir $@) && $(SVN) revert gcc/doc/tm.texi.in cd $(dir $@) && $(SVN) update --revision ${GCC_REVISION} endif @@ -381,7 +389,7 @@ --enable-languages=c,c++,fortran \ $(GCC_CONFIG_ARGS) \ ${GCC_CONFIG_EXTRA_ARGS_MULTI_${ENABLE_MULTILIB}} \ - $(GCC_CONFG_EXTRA_ARGS) + $(GCC_CONFIG_EXTRA_ARGS) touch $@ # -------------------------------------- @@ -461,13 +469,13 @@ # -------------------------------------- pthreads-download : $(SRC_DIR)/pthreads/.co.marker $(SRC_DIR)/pthreads/.co.marker : $(SRC_DIR)/pthreads/.mkdir.marker - cd ${SRC_DIR} && $(CVS) -z9 -d ":pserver:an...@so...:/cvs/pthreads-win32" checkout pthreads + cd ${SRC_DIR} && $(CVS) cvs -z9 -d $(PTHREADS_CVS_PULL) checkout -D ${PTHREADS_CVS_DATE} pthreads @touch $@ pthreads-update : $(SRC_DIR)/pthreads/.update.marker ifeq ($(strip $(PTHREADS_UPDATE)),1) $(SRC_DIR)/pthreads/.update.marker : - cd $(dir $@) && $(CVS) update + cd $(dir $@) && $(CVS) update -D ${PTHREADS_CVS_DATE} else .PHONY: $(SRC_DIR)/pthreads/.update.marker endif @@ -640,4 +648,20 @@ -print -exec strip.exe --strip-unneeded '{}' \; dist : - cd $(PREFIX) && $(TAR) c --exclude '*.marker' * | lzma -czv7 > $(CURDIR)/$(TARGET_ARCH)_gcc-$(GCC_BRANCH)_`date "+%Y%m%d"`.tar.lzma + cd $(PREFIX) && $(TAR) c --exclude '*.marker' --exclude '*.la' * | lzma -czv7 > $(CURDIR)/$(TARGET_ARCH)_gcc-$(GCC_BRANCH)_`date "+%Y%m%d"`.tar.lzma + cd $(PREFIX) && zip -r -9 $(CURDIR)/$(TARGET_ARCH)_gcc-$(GCC_BRANCH)_`date "+%Y%m%d"`.zip . -x '.*.marker' '*.*.marker' '*.la' + +mostly-clean : + if test -e $(PREFIX)/mingw; then junction -d $(PREFIX)/mingw; fi + if test -e $(PREFIX)/$(TARGET_ARCH)/lib; then junction -d "$(PREFIX)/$(TARGET_ARCH)/lib"; fi + -rm -rf $(PREFIX) + -rm -rf $(BUILD_DIR)/binutils + -rm -rf $(BUILD_DIR)/gcc + -rm -rf $(BUILD_DIR)/headers + -rm -rf $(BUILD_DIR)/crt + -rm -rf $(BUILD_DIR)/pthreads + +dist-clean : mostly-clean + -rm -rf $(BUILD_DIR)/mpc + -rm -rf $(BUILD_DIR)/mpfr + -rm -rf $(BUILD_DIR)/gmp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2011-01-27 21:32:11
|
Revision: 8078 http://octave.svn.sourceforge.net/octave/?rev=8078&view=rev Author: lindnerb Date: 2011-01-27 21:32:05 +0000 (Thu, 27 Jan 2011) Log Message: ----------- mingw64: fix cvs compression parameters Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2011-01-27 21:29:32 UTC (rev 8077) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2011-01-27 21:32:05 UTC (rev 8078) @@ -1,3 +1,8 @@ +2011-Jan-27 Benjamin Lindner <lin...@us...> + + * build/makefile (binutils-download): remove explicit -z3 + (binutils-update): ... likewise + 2010-Oct-23 Benjamin Lindner <lin...@us...> * build/makefile (GCC_CONFIG_ARGS): add --disable-lto Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2011-01-27 21:29:32 UTC (rev 8077) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2011-01-27 21:32:05 UTC (rev 8078) @@ -305,13 +305,13 @@ # -------------------------------------- binutils-download :$(SRC_DIR)/binutils/.co.marker $(SRC_DIR)/binutils/.co.marker : $(SRC_DIR)/binutils/.mkdir.marker - cd $(dir $@) && $(CVS) -d ":pserver:an...@so...:/cvs/src" -z3 checkout -d . -N binutils + cd $(dir $@) && $(CVS) -d ":pserver:an...@so...:/cvs/src" checkout -d . -N binutils touch $@ binutils-update : $(SRC_DIR)/binutils/.update.marker ifeq ($(BINUTILS_UPDATE),1) $(SRC_DIR)/binutils/.update.marker : - cd $(dir $@) && $(CVS) -d ":pserver:an...@so...:/cvs/src" -z3 update + cd $(dir $@) && $(CVS) -d ":pserver:an...@so...:/cvs/src" update else .PHONY: $(SRC_DIR)/binutils/.update.marker endif @@ -363,8 +363,6 @@ .PHONY: $(SRC_DIR)/gcc/.update.marker else $(SRC_DIR)/gcc/.update.marker : $(SRC_DIR)/gcc/.co.marker - cd $(dir $@) && $(SVN) revert gcc/doc/tm.texi - cd $(dir $@) && $(SVN) revert gcc/doc/tm.texi.in cd $(dir $@) && $(SVN) update --revision ${GCC_REVISION} endif @@ -397,7 +395,6 @@ # -------------------------------------- gcc-bootstrap-compile : $(BUILD_DIR)/gcc/.bootstrap.compile.marker $(BUILD_DIR)/gcc/.bootstrap.compile.marker : $(BUILD_DIR)/gcc/.config.marker - u2d $(SRC_DIR)/gcc/gcc/doc/tm.texi $(SRC_DIR)/gcc/gcc/doc/tm.texi.in $(MAKE) -C $(dir $@) $(MAKE_PARALLEL) all-gcc touch $@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2011-02-21 21:36:45
|
Revision: 8130 http://octave.svn.sourceforge.net/octave/?rev=8130&view=rev Author: lindnerb Date: 2011-02-21 21:36:38 +0000 (Mon, 21 Feb 2011) Log Message: ----------- mingw64: fix gcc dll installation issue Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2011-02-21 21:32:05 UTC (rev 8129) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2011-02-21 21:36:38 UTC (rev 8130) @@ -1,3 +1,9 @@ +2011-Feb-21 Benjamin Lindner <lin...@us...> + + * build/makefile (gcc-post-install): new target + (dist): don't include .la files + (dist-src): new target + 2011-Jan-27 Benjamin Lindner <lin...@us...> * build/makefile (binutils-download): remove explicit -z3 Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2011-02-21 21:32:05 UTC (rev 8129) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2011-02-21 21:36:38 UTC (rev 8130) @@ -120,6 +120,7 @@ $(error Unknown CPU for target arch ${TARGET_ARCH}) endif +GCC_VERSION=$(shell cat $(SRC_DIR)/gcc/gcc/BASE-VER) # -------------------------------------- # GMP @@ -453,7 +454,7 @@ gcc-libgcc-install : $(BUILD_DIR)/gcc/.libgcc.install.marker $(BUILD_DIR)/gcc/.libgcc.install.marker : $(BUILD_DIR)/gcc/.libgcc.build.marker $(MAKE) -C $(dir $@) install-target-libgcc - cp -av $(PREFIX)/lib/gcc/$(TARGET_ARCH)/lib/libgcc_s.a $(PREFIX)/lib/gcc/$(TARGET_ARCH)/`cat $(SRC_DIR)/gcc/gcc/BASE-VER` + cp -av $(PREFIX)/lib/gcc/$(TARGET_ARCH)/lib/libgcc_s.a $(PREFIX)/lib/gcc/$(TARGET_ARCH)/$(GCC_VERSION) rm -f $(PREFIX)/lib/gcc/$(TARGET_ARCH)/lib/libgcc_s.a touch $@ @@ -601,6 +602,18 @@ $(ADD_BIN_PATH); $(MAKE) -C $(dir $@) install touch $@ +gcc-post-install : $(BUILD_DIR)/gcc/.postinstall.marker +$(BUILD_DIR)/gcc/.postinstall.marker : $(BUILD_DIR)/gcc/.install.marker + mv $(PREFIX)/lib/gcc/$(TARGET_ARCH)/libgcc_s_*.dll $(PREFIX)/bin + mv $(PREFIX)/lib/gcc/$(TARGET_ARCH)/$(GCC_VERSION)/libgfortran-*.dll $(PREFIX)/bin +ifeq ($(TARGET_ARCH),i686-w64-mingw32) + mv $(PREFIX)/lib/gcc/$(TARGET_ARCH)/$(GCC_VERSION)/libgomp-*.dll $(PREFIX)/bin +endif + mv $(PREFIX)/lib/gcc/$(TARGET_ARCH)/$(GCC_VERSION)/libquadmath-*.dll $(PREFIX)/bin + mv $(PREFIX)/lib/gcc/$(TARGET_ARCH)/$(GCC_VERSION)/libssp-*.dll $(PREFIX)/bin + mv $(PREFIX)/lib/gcc/$(TARGET_ARCH)/$(GCC_VERSION)/libstdc++-*.dll $(PREFIX)/bin + touch $@ + GCC_FORWARDERS=\ gcc.exe \ g++.exe \ @@ -638,16 +651,21 @@ gcc-libgcc-all \ pthreads-all \ gcc-build \ - gcc-install + gcc-install \ + gcc-post-install strip-exe : find $(PREFIX) -iname '*.exe' \ -print -exec strip.exe --strip-unneeded '{}' \; -dist : - cd $(PREFIX) && $(TAR) c --exclude '*.marker' --exclude '*.la' * | lzma -czv7 > $(CURDIR)/$(TARGET_ARCH)_gcc-$(GCC_BRANCH)_`date "+%Y%m%d"`.tar.lzma - cd $(PREFIX) && zip -r -9 $(CURDIR)/$(TARGET_ARCH)_gcc-$(GCC_BRANCH)_`date "+%Y%m%d"`.zip . -x '.*.marker' '*.*.marker' '*.la' +dist : DISTNAME=$(shell echo $(TARGET_ARCH)_gcc-$(GCC_BRANCH)_`date "+%Y%m%d"`) +dist : + cd $(PREFIX) && $(TAR) c --exclude '*.marker' --exclude '*.la' * | lzma -czv7 > $(CURDIR)/$(DISTNAME).tar.lzma + cd $(PREFIX) && zip -r -9 $(CURDIR)/$(DISTNAME).zip . -x '.*.marker' '*.*.marker' '*.la' +dist-src : + $(TAR) c --exclude-vcs $(SRC_DIR) patches makefile | lzma -czv7 > $(CURDIR)/gcc-$(GCC_BRANCH)_`date "+%Y%m%d"`-src.tar.lzma + mostly-clean : if test -e $(PREFIX)/mingw; then junction -d $(PREFIX)/mingw; fi if test -e $(PREFIX)/$(TARGET_ARCH)/lib; then junction -d "$(PREFIX)/$(TARGET_ARCH)/lib"; fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lin...@us...> - 2011-03-09 20:05:41
|
Revision: 8166 http://octave.svn.sourceforge.net/octave/?rev=8166&view=rev Author: lindnerb Date: 2011-03-09 20:05:35 +0000 (Wed, 09 Mar 2011) Log Message: ----------- mingw64: fix crossgcc makefile Modified Paths: -------------- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2011-03-09 19:51:13 UTC (rev 8165) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/ChangeLog 2011-03-09 20:05:35 UTC (rev 8166) @@ -1,3 +1,7 @@ +2011-Mar-09 Benjamin Lindner <lin...@us...> + + * build/makefile (pthreads-download): fix double cvs on command line + 2011-Feb-21 Benjamin Lindner <lin...@us...> * build/makefile (gcc-post-install): new target Modified: trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile =================================================================== --- trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2011-03-09 19:51:13 UTC (rev 8165) +++ trunk/octave-forge/admin/Windows/mingw-w64/crossgcc/build/makefile 2011-03-09 20:05:35 UTC (rev 8166) @@ -467,7 +467,7 @@ # -------------------------------------- pthreads-download : $(SRC_DIR)/pthreads/.co.marker $(SRC_DIR)/pthreads/.co.marker : $(SRC_DIR)/pthreads/.mkdir.marker - cd ${SRC_DIR} && $(CVS) cvs -z9 -d $(PTHREADS_CVS_PULL) checkout -D ${PTHREADS_CVS_DATE} pthreads + cd ${SRC_DIR} && $(CVS) -d $(PTHREADS_CVS_PULL) checkout -D ${PTHREADS_CVS_DATE} pthreads @touch $@ pthreads-update : $(SRC_DIR)/pthreads/.update.marker This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |