summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmael Luceno2015-01-05 20:16:28 -0300
committerRemko van der Vossen2019-05-17 23:34:22 +0200
commit2b759cf96bf1ef8305657c031a2839d2f11323d4 (patch)
treecf6d73e3694fa318eeba91c9aff374f046ac5f9d
parent1600cd684b8055a54dcb999d4f6a7ca47d339403 (diff)
gcc: Removed bogus line in PRE_BUILD
-rw-r--r--gnu/gcc/HISTORY1
-rwxr-xr-xgnu/gcc/PRE_BUILD8
2 files changed, 7 insertions, 2 deletions
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index e498008720..3267cdd223 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -3,6 +3,7 @@
2015-01-05 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: Simplified ada binary selection
+ * PRE_BUILD: Removed bogus line
2014-11-15 Thomas Orgis <sobukus@sourcemage.org>
* PRE_BUILD: patch for freetype2 headers
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 63263f407f..0f4e2b1c8b 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -32,8 +32,12 @@ if [[ "$GCC_CLOOG" == "y" ]]; then
fi
if list_find "$GCC_COMPILER" "java"; then
- cp ${SOURCE_CACHE}/${SOURCE5} ${SOURCE_DIRECTORY}/ecj.jar
-fi &&
+ cp -v ${SOURCE_CACHE}/${SOURCE5} ${SOURCE_DIRECTORY}/ecj.jar &&
+
+ # Freetype moved headers - Yay!
+ cd "$SOURCE_DIRECTORY" &&
+ patch -Np1 < "$SCRIPT_DIRECTORY/classpath-ft2include.patch"
+fi &&
mk_source_dir $SOURCE_DIRECTORY.bld &&
cd $SOURCE_DIRECTORY &&