diff options
-rw-r--r-- | src/fltk.mk | 2 | ||||
-rw-r--r-- | src/gcc-pthreads.mk | 20 | ||||
-rw-r--r-- | src/gcc.mk | 57 | ||||
-rw-r--r-- | src/gd.mk | 2 | ||||
-rw-r--r-- | src/liblo.mk | 2 | ||||
-rw-r--r-- | src/plotutils.mk | 2 | ||||
-rw-r--r-- | src/pthreads.mk | 34 | ||||
-rw-r--r-- | src/xine-lib.mk | 2 |
8 files changed, 55 insertions, 66 deletions
diff --git a/src/fltk.mk b/src/fltk.mk index 51c15be..1b0409b 100644 --- a/src/fltk.mk +++ b/src/fltk.mk @@ -10,7 +10,7 @@ $(PKG)_SUBDIR := fltk-$($(PKG)_VERSION) $(PKG)_FILE := fltk-$($(PKG)_VERSION)-source.tar.bz2 $(PKG)_WEBSITE := http://www.fltk.org/ $(PKG)_URL := http://ftp.easysw.com/pub/fltk/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib jpeg libpng +$(PKG)_DEPS := gcc zlib jpeg libpng pthreads define $(PKG)_UPDATE wget -q -O- 'http://www.fltk.org/' | \ diff --git a/src/gcc-pthreads.mk b/src/gcc-pthreads.mk deleted file mode 100644 index d316a87..0000000 --- a/src/gcc-pthreads.mk +++ /dev/null @@ -1,20 +0,0 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. - -# Pthreads-w32 for GCC -PKG := gcc-pthreads -$(PKG)_IGNORE := -$(PKG)_VERSION := 2-8-0 -$(PKG)_CHECKSUM := da8371cb20e8e238f96a1d0651212f154d84a9ac -$(PKG)_SUBDIR := pthreads-w32-$($(PKG)_VERSION)-release -$(PKG)_FILE := pthreads-w32-$($(PKG)_VERSION)-release.tar.gz -$(PKG)_WEBSITE := http://sourceware.org/pthreads-win32/ -$(PKG)_URL := ftp://sourceware.org/pub/pthreads-win32/$($(PKG)_FILE) -$(PKG)_DEPS := - -define $(PKG)_UPDATE - wget -q -O- 'ftp://sourceware.org/pub/pthreads-win32/Release_notes' | \ - $(SED) -n 's,^RELEASE \([0-9][^[:space:]]*\).*,\1,p' | \ - tr '.' '-' | \ - head -1 -endef @@ -3,7 +3,7 @@ # GCC PKG := gcc -$(PKG)_IGNORE := +$(PKG)_IGNORE := $(PKG)_VERSION := 4.5.0 $(PKG)_CHECKSUM := 4beb8366ce1883f37255aa57f0258e7d3cd13a9b $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) @@ -11,7 +11,7 @@ $(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 := mingwrt mingwrt-dll w32api binutils gcc-gmp gcc-mpc gcc-mpfr gcc-pthreads +$(PKG)_DEPS := mingwrt mingwrt-dll w32api binutils gcc-gmp gcc-mpc gcc-mpfr define $(PKG)_UPDATE wget -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \ @@ -20,7 +20,18 @@ define $(PKG)_UPDATE head -1 endef -$(PKG)_CONFIGURE_OPTIONS := \ +define $(PKG)_BUILD + # unpack support libraries + cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-gmp) + mv '$(1)/$(gcc-gmp_SUBDIR)' '$(1)/gmp' + cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpc) + mv '$(1)/$(gcc-mpc_SUBDIR)' '$(1)/mpc' + cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpfr) + mv '$(1)/$(gcc-mpfr_SUBDIR)' '$(1)/mpfr' + + # build GCC and support libraries + mkdir '$(1)/build' + cd '$(1)/build' && '$(1)/configure' \ --target='$(TARGET)' \ --prefix='$(PREFIX)' \ --enable-languages='c,c++,objc,fortran' \ @@ -32,46 +43,10 @@ $(PKG)_CONFIGURE_OPTIONS := \ --disable-shared \ --without-x \ --disable-win32-registry \ - --enable-sjlj-exceptions - -define $(PKG)_BUILD - # unpack support libraries - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-gmp) - mv '$(1)/$(gcc-gmp_SUBDIR)' '$(1)/gmp' - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpc) - mv '$(1)/$(gcc-mpc_SUBDIR)' '$(1)/mpc' - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpfr) - mv '$(1)/$(gcc-mpfr_SUBDIR)' '$(1)/mpfr' - # build everything of GCC except libgomp and libmudflap - mkdir '$(1)/build' - cd '$(1)/build' && '$(1)/configure' \ - $(gcc_CONFIGURE_OPTIONS) \ - --enable-threads=win32 \ - --disable-libgomp \ - --disable-libmudflap + --enable-sjlj-exceptions \ + --enable-threads=win32 $(MAKE) -C '$(1)/build' -j '$(JOBS)' $(MAKE) -C '$(1)/build' -j 1 install - # unpack and build pthreads (needed by libgomp) - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-pthreads) - $(SED) -i '35i\#define PTW32_STATIC_LIB' '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h' - $(SED) -i '41i\#define PTW32_STATIC_LIB' '$(1)/$(gcc-pthreads_SUBDIR)/sched.h' - $(SED) -i '41i\#define PTW32_STATIC_LIB' '$(1)/$(gcc-pthreads_SUBDIR)/semaphore.h' - $(SED) -i 's,#include "config.h",,' '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h' - $(MAKE) -C '$(1)/$(gcc-pthreads_SUBDIR)' -j 1 GC-static CROSS='$(TARGET)-' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h' '$(PREFIX)/$(TARGET)/include/' - $(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) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/libgomp/configure' - mkdir '$(1)/build/$(TARGET)/libgomp' - cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \ - $(gcc_CONFIGURE_OPTIONS) \ - --host='$(TARGET)' \ - LIBS='-lws2_32' - $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)' install # create pkg-config script (echo '#!/bin/sh'; \ @@ -11,7 +11,7 @@ $(PKG)_FILE := gd-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.libgd.org/ $(PKG)_URL := http://www.libgd.org/releases/$($(PKG)_FILE) $(PKG)_URL_2 := http://www.libgd.org/releases/oldreleases/$($(PKG)_FILE) -$(PKG)_DEPS := gcc freetype libpng jpeg libxml2 +$(PKG)_DEPS := gcc freetype libpng jpeg libxml2 pthreads define $(PKG)_UPDATE wget -q -O- 'http://www.libgd.org/releases/' | \ diff --git a/src/liblo.mk b/src/liblo.mk index e4aebda..a0899fd 100644 --- a/src/liblo.mk +++ b/src/liblo.mk @@ -10,7 +10,7 @@ $(PKG)_SUBDIR := liblo-$($(PKG)_VERSION) $(PKG)_FILE := liblo-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://liblo.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/liblo/liblo/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc +$(PKG)_DEPS := gcc pthreads define $(PKG)_UPDATE $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/liblo/files/liblo/) | \ diff --git a/src/plotutils.mk b/src/plotutils.mk index 1745cd9..35bed78 100644 --- a/src/plotutils.mk +++ b/src/plotutils.mk @@ -11,7 +11,7 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.gnu.org/software/plotutils/ $(PKG)_URL := http://ftpmirror.gnu.org/$(PKG)/$($(PKG)_FILE) $(PKG)_URL_2 := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libpng +$(PKG)_DEPS := gcc libpng pthreads define $(PKG)_UPDATE wget -q -O- 'http://ftp.gnu.org/gnu/plotutils/?C=M;O=D' | \ diff --git a/src/pthreads.mk b/src/pthreads.mk new file mode 100644 index 0000000..edfc8d3 --- /dev/null +++ b/src/pthreads.mk @@ -0,0 +1,34 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +# Pthreads-w32 +PKG := pthreads +$(PKG)_IGNORE := +$(PKG)_VERSION := 2-8-0 +$(PKG)_CHECKSUM := da8371cb20e8e238f96a1d0651212f154d84a9ac +$(PKG)_SUBDIR := pthreads-w32-$($(PKG)_VERSION)-release +$(PKG)_FILE := pthreads-w32-$($(PKG)_VERSION)-release.tar.gz +$(PKG)_WEBSITE := http://sourceware.org/pthreads-win32/ +$(PKG)_URL := ftp://sourceware.org/pub/pthreads-win32/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + wget -q -O- 'ftp://sourceware.org/pub/pthreads-win32/Release_notes' | \ + $(SED) -n 's,^RELEASE \([0-9][^[:space:]]*\).*,\1,p' | \ + tr '.' '-' | \ + head -1 +endef + +define $(PKG)_BUILD + $(SED) -i '35i\#define PTW32_STATIC_LIB' '$(1)/pthread.h' + $(SED) -i '41i\#define PTW32_STATIC_LIB' '$(1)/sched.h' + $(SED) -i '41i\#define PTW32_STATIC_LIB' '$(1)/semaphore.h' + $(SED) -i 's,#include "config.h",,' '$(1)/pthread.h' + $(MAKE) -C '$(1)' -j 1 GC-static CROSS='$(TARGET)-' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m664 '$(1)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -m664 '$(1)/pthread.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m664 '$(1)/sched.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m664 '$(1)/semaphore.h' '$(PREFIX)/$(TARGET)/include/' +endef diff --git a/src/xine-lib.mk b/src/xine-lib.mk index 60c580d..711c41b 100644 --- a/src/xine-lib.mk +++ b/src/xine-lib.mk @@ -10,7 +10,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.xine-project.org/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/xine/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib libiconv libmng sdl vorbis theora speex flac freetype fontconfig +$(PKG)_DEPS := gcc zlib libiconv libmng sdl vorbis theora speex flac freetype fontconfig pthreads define $(PKG)_UPDATE wget -q -O- 'http://hg.debian.org/hg/xine-lib/xine-lib/tags' | \ |