summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/index.html2
-rw-r--r--src/fltk.mk2
-rw-r--r--src/gcc-pthreads.mk (renamed from src/pthreads.mk)15
-rw-r--r--src/gcc.mk50
-rw-r--r--src/libmikmod.mk2
-rw-r--r--src/tiff.mk2
-rw-r--r--src/vorbis.mk2
7 files changed, 44 insertions, 31 deletions
diff --git a/doc/index.html b/doc/index.html
index 028e9de..00acca7 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -370,7 +370,7 @@ AR=$(CROSS)ar</pre>
</p>
<p>
- This release ...
+ This release enables OpenMP support in GCC.
</p>
<p>
diff --git a/src/fltk.mk b/src/fltk.mk
index 8724665..3d2e274 100644
--- a/src/fltk.mk
+++ b/src/fltk.mk
@@ -27,7 +27,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 pthreads zlib jpeg libpng
+$(PKG)_DEPS := gcc zlib jpeg libpng
define $(PKG)_UPDATE
wget -q -O- 'http://www.fltk.org/' | \
diff --git a/src/pthreads.mk b/src/gcc-pthreads.mk
index 6fd26e8..a6e0412 100644
--- a/src/pthreads.mk
+++ b/src/gcc-pthreads.mk
@@ -19,15 +19,15 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# pthreads-w32
-PKG := pthreads
+# Pthreads-w32 for GCC
+PKG := gcc-pthreads
$(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
+$(PKG)_DEPS :=
define $(PKG)_UPDATE
wget -q -O- 'ftp://sourceware.org/pub/pthreads-win32/Release_notes' | \
@@ -35,12 +35,3 @@ define $(PKG)_UPDATE
tr '.' '-' | \
head -1
endef
-
-define $(PKG)_BUILD
- $(SED) '35i\#define PTW32_STATIC_LIB' -i '$(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' '$(1)/sched.h' '$(1)/semaphore.h' '$(PREFIX)/$(TARGET)/include/'
-endef
diff --git a/src/gcc.mk b/src/gcc.mk
index c2ec117..aff2499 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -27,7 +27,7 @@ $(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 w32api binutils gcc-gmp gcc-mpfr gcc-core gcc-g++ gcc-objc gcc-fortran
+$(PKG)_DEPS := pkg_config mingwrt w32api binutils gcc-gmp gcc-mpfr gcc-core gcc-g++ gcc-objc gcc-fortran gcc-pthreads
define $(PKG)_UPDATE
$(call SOURCEFORGE_FILES,http://sourceforge.net/projects/tdm-gcc/files/Sources/) | \
@@ -35,6 +35,20 @@ define $(PKG)_UPDATE
tail -1
endef
+$(PKG)_CONFIGURE_OPTIONS := \
+ --target='$(TARGET)' \
+ --prefix='$(PREFIX)' \
+ --enable-languages='c,c++,objc,fortran' \
+ --enable-version-specific-runtime-libs \
+ --with-gcc \
+ --with-gnu-ld \
+ --with-gnu-as \
+ --disable-nls \
+ --disable-shared \
+ --without-x \
+ --disable-win32-registry \
+ --enable-sjlj-exceptions
+
define $(PKG)_BUILD
# unpack GCC
cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-core)
@@ -51,22 +65,30 @@ define $(PKG)_BUILD
mv '$(1)/$(gcc-gmp_SUBDIR)' '$(1)/$(gcc-core_SUBDIR)/gmp'
cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpfr)
mv '$(1)/$(gcc-mpfr_SUBDIR)' '$(1)/$(gcc-core_SUBDIR)/mpfr'
- # build
+ # build everything of GCC except libgomp and libmudflap
mkdir '$(1)/build'
cd '$(1)/build' && '$(1)/$(gcc-core_SUBDIR)/configure' \
- --target='$(TARGET)' \
- --prefix='$(PREFIX)' \
- --enable-languages='c,c++,objc,fortran' \
- --enable-version-specific-runtime-libs \
- --with-gcc \
- --with-gnu-ld \
- --with-gnu-as \
- --disable-nls \
- --disable-shared \
- --without-x \
+ $(gcc_CONFIGURE_OPTIONS) \
--enable-threads=win32 \
- --disable-win32-registry \
- --enable-sjlj-exceptions
+ --disable-libgomp \
+ --disable-libmudflap
$(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) '35i\#define PTW32_STATIC_LIB' -i '$(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
+ mkdir '$(1)/build/$(TARGET)/libgomp'
+ cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/$(gcc-core_SUBDIR)/libgomp/configure' \
+ $(gcc_CONFIGURE_OPTIONS) \
+ --host='$(TARGET)' \
+ LIBS='-lws2_32'
+ $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)' install
endef
diff --git a/src/libmikmod.mk b/src/libmikmod.mk
index 89bc5e9..7f5f1cb 100644
--- a/src/libmikmod.mk
+++ b/src/libmikmod.mk
@@ -27,7 +27,7 @@ $(PKG)_SUBDIR := libmikmod-$($(PKG)_VERSION)
$(PKG)_FILE := libmikmod-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://mikmod.raphnet.net/
$(PKG)_URL := http://mikmod.raphnet.net/files/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc pthreads
+$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
wget -q -O- 'http://mikmod.raphnet.net/' | \
diff --git a/src/tiff.mk b/src/tiff.mk
index 1bcb3f0..2fec7b5 100644
--- a/src/tiff.mk
+++ b/src/tiff.mk
@@ -28,7 +28,7 @@ $(PKG)_FILE := tiff-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.remotesensing.org/libtiff/
$(PKG)_URL := http://ftp.remotesensing.org/libtiff/$($(PKG)_FILE)
$(PKG)_URL_2 := http://download.osgeo.org/libtiff/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc pthreads zlib jpeg
+$(PKG)_DEPS := gcc zlib jpeg
define $(PKG)_UPDATE
wget -q -O- 'http://www.remotesensing.org/libtiff/' | \
diff --git a/src/vorbis.mk b/src/vorbis.mk
index 84beffe..8756aee 100644
--- a/src/vorbis.mk
+++ b/src/vorbis.mk
@@ -27,7 +27,7 @@ $(PKG)_SUBDIR := libvorbis-$($(PKG)_VERSION)
$(PKG)_FILE := libvorbis-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.vorbis.com/
$(PKG)_URL := http://downloads.xiph.org/releases/vorbis/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc pthreads ogg
+$(PKG)_DEPS := gcc ogg
define $(PKG)_UPDATE
wget -q -O- 'http://www.xiph.org/downloads/' | \
generated by cgit v0.12 at 2025-01-28 17:51:16 (GMT)