diff options
author | Thomas Kunze <thommycheck@gmx.de> | 2008-04-15 10:39:59 +0000 |
---|---|---|
committer | Thomas Kunze <thommycheck@gmx.de> | 2008-04-15 10:39:59 +0000 |
commit | 907c2d35eb8bb9f592909eb017820b7a8fe62ec6 (patch) | |
tree | 554007e0ccb541d5e08b7741d7d302e978902df4 /packages/gcc/gcc-4.3.0/debian/libjava-armel-ldflags.dpatch | |
parent | 7a74595f87ad18f7435ce192f9667b962225087e (diff) | |
parent | 822be3b99d846eb5fc1bb4c3a665d439c0c1f7a4 (diff) |
merge of '9bafa1b756e6de75c93929437624ddf20c6155f3'
and 'ae71623a2c722c78935fc0461cdcaab87317ba3b'
Diffstat (limited to 'packages/gcc/gcc-4.3.0/debian/libjava-armel-ldflags.dpatch')
-rw-r--r-- | packages/gcc/gcc-4.3.0/debian/libjava-armel-ldflags.dpatch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/packages/gcc/gcc-4.3.0/debian/libjava-armel-ldflags.dpatch b/packages/gcc/gcc-4.3.0/debian/libjava-armel-ldflags.dpatch new file mode 100644 index 0000000000..ecaddb61e0 --- /dev/null +++ b/packages/gcc/gcc-4.3.0/debian/libjava-armel-ldflags.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh -e + +# DP: Adjust libjava extra_ldflags for armel. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + cd ${dir}libjava && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + rm -f ${dir}libjava/configure + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +--- libjava/configure.ac~ 2008-01-14 15:45:26.698717101 +0100 ++++ libjava/configure.ac 2008-01-14 15:47:37.460689616 +0100 +@@ -807,7 +807,7 @@ + # Some of the ARM unwinder code is actually in libstdc++. We + # could in principle replicate it in libgcj, but it's better to + # have a dependency on libstdc++. +- extra_ldflags='-L$(here)/../libstdc++-v3/src/.libs -lstdc++' ++ extra_ldflags='-L$(here)/../libstdc++-v3/src -L$(here)/../libstdc++-v3/src/.libs -lstdc++' + LIBSTDCXXSPEC=-lstdc++ + LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -L`${PWDCMD-pwd}`/../libstdc++-v3/src/.libs -rpath `${PWDCMD-pwd}`/.libs:`${PWDCMD-pwd}`/../libstdc++-v3/src/.libs -lstdc++" + ;; |