dsc
/
mxe
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #965 from LuaAndC/downgrade-gcc-to-4-9

Browse Source 
Downgrade gcc to 4.9
pull/966/merge
Tony Theodore 9 years ago
parent 5f26c231ea 44ad79155d
commit db679f3a65
5 changed files with 92 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
index.html
Unescape View File

@ -1158,6 +1158,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<td class="package">chromaprint</td>
<td class="website"><a href="http://acoustid.org/chromaprint">Chromaprint</a></td>
</tr>
<tr>
<td class="package">cloog</td>
<td class="website"><a href="http://www.cloog.org/">CLooG Code Generator</a></td>
</tr>
<tr>
<td class="package">cimg</td>
<td class="website"><a href="http://cimg.eu/">CImg Library</a></td>

34
src/cloog.mk
Unescape View File

@ -0,0 +1,34 @@
# This file is part of MXE.
# See index.html for further information.
PKG := cloog
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.18.1
$(PKG)_CHECKSUM := 02500a4edd14875f94fe84cbeda4290425cb0c1c2474c6f75d75a303d64b4196
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://www.bastoul.net/cloog/pages/download/$($(PKG)_FILE)
$(PKG)_URL_2 := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
$(PKG)_DEPS := gcc gmp isl
$(PKG)_DEPS_$(BUILD) := gmp isl
# stick to tested versions from gcc
define $(PKG)_UPDATE
$(WGET) -q -O- 'ftp://gcc.gnu.org/pub/gcc/infrastructure/' | \
$(SED) -n 's,.*cloog-\([0-9][^>]*\)\.tar.*,\1,p' | \
$(SORT) -V |
tail -1
endef
define $(PKG)_BUILD_$(BUILD)
cd '$(1)' && ./configure \
$(MXE_CONFIGURE_OPTS) \
--with-gmp-prefix='$(PREFIX)/$(TARGET)' \
--with-isl-prefix='$(PREFIX)/$(TARGET)'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j '$(JOBS)' install
endef
$(PKG)_BUILD_SHARED =

31
src/gcc.mk
Unescape View File

@ -3,8 +3,8 @@
PKG := gcc
$(PKG)_IGNORE :=
$(PKG)_VERSION := 5.2.0
$(PKG)_CHECKSUM := 5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad
$(PKG)_VERSION := 4.9.3
$(PKG)_CHECKSUM := 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e
$(PKG)_SUBDIR := gcc-$($(PKG)_VERSION)
$(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
@ -44,6 +44,7 @@ define $(PKG)_CONFIGURE
--with-isl='$(PREFIX)/$(BUILD)' \
--with-mpc='$(PREFIX)/$(BUILD)' \
--with-mpfr='$(PREFIX)/$(BUILD)' \
--with-cloog='$(PREFIX)/$(BUILD)' \
--with-as='$(PREFIX)/bin/$(TARGET)-as' \
--with-ld='$(PREFIX)/bin/$(TARGET)-ld' \
--with-nm='$(PREFIX)/bin/$(TARGET)-nm' \
@ -52,14 +53,13 @@ endef
define $(PKG)_POST_BUILD
# TODO: find a way to configure the installation of these correctly
rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, c++ g++ gcc gfortran)
-mv '$(PREFIX)/lib/gcc/$(TARGET)/lib/'* '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'
-mv '$(PREFIX)/lib/gcc/$(TARGET)/'*.dll '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'
-mv '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/'
-cp '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll.a '$(PREFIX)/$(TARGET)/lib/'
# remove incorrectly installed libcc1
rm -f '$(PREFIX)/lib/'libcc1*
# ignore rm failure as parallel build may have cleaned up, but
# don't wildcard all libs so future additions will be detected
$(and $(BUILD_SHARED),
mv -v '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/gcc-$($(PKG)_VERSION)/'
-rm -v '$(PREFIX)/lib/gcc/$(TARGET)/'libgcc_s*.dll
-rm -v '$(PREFIX)/lib/gcc/$(TARGET)/lib/'libgcc_s*.a
-rmdir '$(PREFIX)/lib/gcc/$(TARGET)/lib/')
endef
define $(PKG)_BUILD_mingw-w64
@ -97,11 +97,16 @@ define $(PKG)_BUILD_mingw-w64
# build rest of gcc
cd '$(1).build'
$(MAKE) -C '$(1).build' -j '$(JOBS)'
# cc1libdir isn't passed to subdirs so install correctly and rm later
$(MAKE) -C '$(1).build/libcc1' -j 1 install cc1libdir='$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)'
$(MAKE) -C '$(1).build' -j 1 install
# shared libgcc isn't installed to version-specific locations
# so install correctly to avoid clobbering with multiple versions
$(and $(BUILD_SHARED),
$(MAKE) -C '$(1).build/$(TARGET)/libgcc' -j 1 \
toolexecdir='$(PREFIX)/$(TARGET)/bin/gcc-$($(PKG)_VERSION)' \
SHLIB_SLIBDIR_QUAL= \
install-shared)
$($(PKG)_POST_BUILD)
endef

4
src/isl.mk
Unescape View File

@ -3,8 +3,8 @@
PKG := isl
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.14
$(PKG)_CHECKSUM := 7e3c02ff52f8540f6a85534f54158968417fd676001651c8289c705bd0228f36
$(PKG)_VERSION := 0.12.2
$(PKG)_CHECKSUM := f4b3dbee9712850006e44f0db2103441ab3d13b406f77996d1df19ee89d11fb4
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://isl.gforge.inria.fr/$($(PKG)_FILE)

34
src/libmysqlclient-1-fixes.patch
Unescape View File

@ -337,3 +337,37 @@ index 69d19b8..738563b 100644
--
2.3.8 (Apple Git-58)
From eb38e04f41ac341b162cfa0e97aa3ee1ce783777 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 11 Nov 2015 07:44:44 +0000
Subject: [PATCH] add 'static' to some inline functions
Fix https://gist.github.com/starius/71d5f276d62e58f36d2f
See also http://stackoverflow.com/a/8502046
diff --git a/include/my_global.h b/include/my_global.h
index 8c3c3cd..3cb24f6 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -340,7 +340,7 @@ typedef socket_len_t SOCKET_SIZE_TYPE; /* Used by NDB */
#if (_WIN32)
#if !defined(_WIN64)
-inline double my_ulonglong2double(unsigned long long value)
+static inline double my_ulonglong2double(unsigned long long value)
{
long long nr=(long long) value;
if (nr >= 0)
@@ -350,7 +350,7 @@ inline double my_ulonglong2double(unsigned long long value)
#define ulonglong2double my_ulonglong2double
#define my_off_t2double my_ulonglong2double
#endif /* _WIN64 */
-inline unsigned long long my_double2ulonglong(double d)
+static inline unsigned long long my_double2ulonglong(double d)
{
double t= d - (double) 0x8000000000000000ULL;
--
2.1.4

Write Preview
Loading…
Cancel
Save