Mercurial > mxe-octave
changeset 504:0fd340b5a6a8
improved structure of the gcc-* packages
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Tue, 27 Oct 2009 14:33:05 +0100 |
parents | 164b71d374f4 |
children | 398d63c87ef8 |
files | src/gcc-core.mk src/gcc-fortran.mk src/gcc-g++.mk src/gcc-objc.mk src/gcc-tdm.mk src/gcc.mk |
diffstat | 6 files changed, 65 insertions(+), 174 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gcc-core.mk Tue Oct 27 14:04:29 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -# Copyright (C) 2009 Volker Grabsch -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject -# to the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -# GCC core -PKG := gcc-core -$(PKG)_IGNORE := 4.4.1 -$(PKG)_VERSION := 4.4.0 -$(PKG)_CHECKSUM := 081c5a1e49157b9c48fe97497633b6ff39032eb5 -$(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) -$(PKG)_FILE := gcc-core-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://gcc.gnu.org/ -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla Sources/_Deprecated/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := - -define $(PKG)_UPDATE - $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/tdm-gcc/files/Sources/) | \ - $(SED) -n 's,.*gcc-core-\([0-9][^>]*\)\.tar.*,\1,p' | \ - tail -1 -endef
--- a/src/gcc-fortran.mk Tue Oct 27 14:04:29 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -# Copyright (C) 2009 Volker Grabsch -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject -# to the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -# GCC fortran -PKG := gcc-fortran -$(PKG)_IGNORE := 4.4.1 -$(PKG)_VERSION := 4.4.0 -$(PKG)_CHECKSUM := 5f9e32d9061937e7706d35d2d5458675352b1368 -$(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) -$(PKG)_FILE := gcc-fortran-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://gcc.gnu.org/ -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla Sources/_Deprecated/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := - -define $(PKG)_UPDATE - $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/tdm-gcc/files/Sources/) | \ - $(SED) -n 's,.*gcc-fortran-\([0-9][^>]*\)\.tar.*,\1,p' | \ - tail -1 -endef
--- a/src/gcc-g++.mk Tue Oct 27 14:04:29 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -# Copyright (C) 2009 Volker Grabsch -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject -# to the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -# GCC g++ -PKG := gcc-g++ -$(PKG)_IGNORE := 4.4.1 -$(PKG)_VERSION := 4.4.0 -$(PKG)_CHECKSUM := 063d5acca79ec00276cf6ebdba414804abf3fcb6 -$(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) -$(PKG)_FILE := gcc-g++-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://gcc.gnu.org/ -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla Sources/_Deprecated/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := - -define $(PKG)_UPDATE - $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/tdm-gcc/files/Sources/) | \ - $(SED) -n 's,.*gcc-g++-\([0-9][^>]*\)\.tar.*,\1,p' | \ - tail -1 -endef
--- a/src/gcc-objc.mk Tue Oct 27 14:04:29 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -# Copyright (C) 2009 Volker Grabsch -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject -# to the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -# GCC objc -PKG := gcc-objc -$(PKG)_IGNORE := 4.4.1 -$(PKG)_VERSION := 4.4.0 -$(PKG)_CHECKSUM := 21cd70e01c211553c59123c62b4f33330ad212c4 -$(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) -$(PKG)_FILE := gcc-objc-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://gcc.gnu.org/ -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla Sources/_Deprecated/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := - -define $(PKG)_UPDATE - $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/tdm-gcc/files/Sources/) | \ - $(SED) -n 's,.*gcc-objc-\([0-9][^>]*\)\.tar.*,\1,p' | \ - tail -1 -endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gcc-tdm.mk Tue Oct 27 14:33:05 2009 +0100 @@ -0,0 +1,37 @@ +# Copyright (C) 2009 Volker Grabsch +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject +# to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# TDM-GCC +PKG := gcc-tdm +$(PKG)_IGNORE := 4.4.1-tdm-2 +$(PKG)_VERSION := 4.4.0-tdm-1 +$(PKG)_CHECKSUM := ec1c81acf0581b4f1e2d5498ce9cd015b63e917b +$(PKG)_SUBDIR := . +$(PKG)_FILE := gcc-$($(PKG)_VERSION)-srcbase-2.zip +$(PKG)_WEBSITE := http://www.tdragon.net/recentgcc/ +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/TDM Sources/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/tdm-gcc/files/Sources/) | \ + $(SED) -n 's,.*gcc-\([0-9][^>]*\)-srcbase[-0-9]*\.zip.*,\1,p' | \ + tail -1 +endef
--- a/src/gcc.mk Tue Oct 27 14:04:29 2009 +0100 +++ b/src/gcc.mk Tue Oct 27 14:33:05 2009 +0100 @@ -19,21 +19,24 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# TDM-GCC +# GCC PKG := gcc -$(PKG)_IGNORE := 4.4.1-tdm-2 -$(PKG)_VERSION := 4.4.0-tdm-1 -$(PKG)_CHECKSUM := ec1c81acf0581b4f1e2d5498ce9cd015b63e917b -$(PKG)_SUBDIR := . -$(PKG)_FILE := gcc-$($(PKG)_VERSION)-srcbase-2.zip -$(PKG)_WEBSITE := http://www.tdragon.net/recentgcc/ -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/TDM Sources/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := pkg_config mingwrt mingwrt-dll w32api binutils gcc-gmp gcc-mpfr gcc-core gcc-g++ gcc-objc gcc-fortran gcc-pthreads +$(PKG)_IGNORE := 4.4.2 +$(PKG)_VERSION := 4.4.0 +$(PKG)_CHECKSUM := 9215af6beb900ca1eef1d6a40c3dabe990203b25 +$(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) +$(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 +$(PKG)_WEBSITE := http://gcc.gnu.org/ +$(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := pkg_config mingwrt mingwrt-dll w32api binutils gcc-gmp gcc-mpfr gcc-tdm gcc-pthreads define $(PKG)_UPDATE - $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/tdm-gcc/files/Sources/) | \ - $(SED) -n 's,.*gcc-\([0-9][^>]*\)-srcbase[-0-9]*\.zip.*,\1,p' | \ - tail -1 + wget -q -O- 'http://gcc.gnu.org/viewcvs/tags/?sortby=date' | \ + grep '<a name="gcc_' | \ + $(SED) -n 's,.*<a name="gcc_\([0-9][^"]*\)_release".*,\1,p' | \ + $(SED) 's,_,.,g' | \ + head -1 endef $(PKG)_CONFIGURE_OPTIONS := \ @@ -51,24 +54,23 @@ --enable-sjlj-exceptions define $(PKG)_BUILD - # unpack GCC - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-core) - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-g++) - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-objc) - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-fortran) - # apply TDM patches to GCC - cd '$(1)/$(gcc-core_SUBDIR)' && \ - for p in '$(1)'/*.patch; do \ - patch -p1 < "$$p"; \ + # unpack TDM-GCC + mkdir '$(1)/gcc-tdm' + cd '$(1)/gcc-tdm' && $(call UNPACK_PKG_ARCHIVE,gcc-tdm) + # apply TDM-GCC patches + cd '$(1)' && \ + for p in '$(1)'/gcc-tdm/*.patch; do \ + $(SED) 's,\r$$,,' -i "$$p" || exit 1; \ + patch -p1 < "$$p" || exit 1; \ done # unpack support libraries cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-gmp) - mv '$(1)/$(gcc-gmp_SUBDIR)' '$(1)/$(gcc-core_SUBDIR)/gmp' + mv '$(1)/$(gcc-gmp_SUBDIR)' '$(1)/gmp' cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpfr) - mv '$(1)/$(gcc-mpfr_SUBDIR)' '$(1)/$(gcc-core_SUBDIR)/mpfr' + mv '$(1)/$(gcc-mpfr_SUBDIR)' '$(1)/mpfr' # build everything of GCC except libgomp and libmudflap mkdir '$(1)/build' - cd '$(1)/build' && '$(1)/$(gcc-core_SUBDIR)/configure' \ + cd '$(1)/build' && '$(1)/configure' \ $(gcc_CONFIGURE_OPTIONS) \ --enable-threads=win32 \ --disable-libgomp \ @@ -87,9 +89,9 @@ $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/sched.h' '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/semaphore.h' '$(PREFIX)/$(TARGET)/include/' # build libgomp - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/$(gcc-core_SUBDIR)/libgomp/configure' + $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/libgomp/configure' mkdir '$(1)/build/$(TARGET)/libgomp' - cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/$(gcc-core_SUBDIR)/libgomp/configure' \ + cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \ $(gcc_CONFIGURE_OPTIONS) \ --host='$(TARGET)' \ LIBS='-lws2_32'