diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2019-11-19 17:35:47 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2019-11-19 17:35:47 +0300 |
| commit | 03bebac19e6fef19299d7326d3ee41f8a7dd1316 (patch) | |
| tree | bb413d22ada331790f08b7b9a592e5ab95cd8918 /debian/patches/cross-biarch.diff | |
| parent | 94a19f31b81e9e7e295414fe2ad2302e0db25a08 (diff) | |
| parent | 8f6c4b0033c72f8ac14694c419a99458339dd6a9 (diff) | |
| download | gcc-9-03bebac19e6fef19299d7326d3ee41f8a7dd1316.tar.gz | |
Merge tag 'debian/9.2.1-19'
Diffstat (limited to 'debian/patches/cross-biarch.diff')
| -rw-r--r-- | debian/patches/cross-biarch.diff | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/debian/patches/cross-biarch.diff b/debian/patches/cross-biarch.diff index 27e2ff9..a62d4d7 100644 --- a/debian/patches/cross-biarch.diff +++ b/debian/patches/cross-biarch.diff @@ -1,7 +1,5 @@ # DP: Fix the location of target's libs in cross-build for biarch -Index: b/src/config-ml.in -=================================================================== --- a/src/config-ml.in +++ b/src/config-ml.in @@ -533,7 +533,13 @@ multi-do: @@ -20,8 +18,8 @@ Index: b/src/config-ml.in CCASFLAGS="$(CCASFLAGS) $${flags}" \ FCFLAGS="$(FCFLAGS) $${flags}" \ @@ -786,6 +792,15 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n - GFORTRAN_=$GFORTRAN' ' GOC_=$GOC' ' + GDC_=$GDC' ' else + if [ "${ml_dir}" = "." ]; then + FILTER_="s!X\\(.*\\)!\\1!p" @@ -65,27 +63,27 @@ Index: b/src/config-ml.in @@ -830,6 +851,8 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n case $arg in -[BIL]"${ML_POPDIR}"/*) - GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; + GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; + -B*/lib/) -+ GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;; ++ GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;; "${ML_POPDIR}"/*) - GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; + GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; *) @@ -842,6 +865,8 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n case $arg in -[BIL]"${ML_POPDIR}"/*) - GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; + GOC_="${GOC_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; + -B*/lib/) -+ GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;; ++ GOC_="${GOC_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;; "${ML_POPDIR}"/*) - GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; + GOC_="${GOC_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; *) @@ -854,6 +879,8 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n case $arg in -[BIL]"${ML_POPDIR}"/*) - GOC_="${GOC_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; + GDC_="${GDC_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; + -B*/lib/) -+ GOC_="${GOC_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;; ++ GDC_="${GDC_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;; "${ML_POPDIR}"/*) - GOC_="${GOC_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; + GDC_="${GDC_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; *) |