← Back to branch summary

~angelsl/ubuntu/wily/gcc-5/mips-cross

« back to all changes in this revision

Viewing changes to debian/patches/config-ml.diff

  • Committer: angelsl
  • Date: 2015-10-30 03:30:35 UTC
  • Revision ID: angelsl-20151030033035-rmug41zm8hyjgisg
Original import

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/config-ml.diff
 
1
# DP: - Disable some biarch libraries for biarch builds.
 
2
# DP: - Fix multilib builds on kernels which don't support all multilibs.
 
3
 
 
4
Index: b/src/config-ml.in
 
5
===================================================================
 
6
--- a/src/config-ml.in
 
7
+++ b/src/config-ml.in
 
8
@@ -475,6 +475,25 @@ powerpc*-*-* | rs6000*-*-*)
 
9
        ;;
 
10
 esac
 
11
 
 
12
+if [ -z "$biarch_multidir_names" ]; then
 
13
+  biarch_multidir_names="libiberty libstdc++-v3 libgfortran libmudflap libssp libffi libobjc libgomp"
 
14
+  echo "WARNING: biarch_multidir_names is unset. Use default value:"
 
15
+  echo "  $biarch_multidir_names"
 
16
+fi
 
17
+ml_srcbase=`basename $ml_realsrcdir`
 
18
+old_multidirs="${multidirs}"
 
19
+multidirs=""
 
20
+for x in ${old_multidirs}; do
 
21
+    case " $x " in
 
22
+       " 32 "|" n32 "|" x32 "|" 64 "|" hf "|" sf ")
 
23
+       case "$biarch_multidir_names" in
 
24
+           *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;;
 
25
+       esac
 
26
+       ;;
 
27
+       *) multidirs="${multidirs} ${x}" ;;
 
28
+    esac
 
29
+done
 
30
+
 
31
 # Remove extraneous blanks from multidirs.
 
32
 # Tests like `if [ -n "$multidirs" ]' require it.
 
33
 multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ][ ]*/ /g'`
 
34
@@ -880,9 +899,20 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
 
35
        fi
 
36
     fi
 
37
 
 
38
+    ml_configure_args=
 
39
+    for arg in ${ac_configure_args}
 
40
+    do
 
41
+      case $arg in
 
42
+      *CC=*)  ml_configure_args=${ml_config_env} ;;
 
43
+      *CXX=*) ml_configure_args=${ml_config_env} ;;
 
44
+      *GCJ=*) ml_configure_args=${ml_config_env} ;;
 
45
+      *) ;;
 
46
+      esac
 
47
+    done
 
48
+
 
49
     if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
 
50
        --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
 
51
-       "${ac_configure_args}" ${ml_config_env} ${ml_srcdiroption} ; then
 
52
+       "${ac_configure_args}" ${ml_configure_args} ${ml_config_env} ${ml_srcdiroption} ; then
 
53
       true
 
54
     else
 
55
       exit 1