diff options
| author | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2009-04-27 17:47:41 +0200 |
|---|---|---|
| committer | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2009-04-27 17:47:41 +0200 |
| commit | 691fd364dc741a8df339a1c3f74d941589ebaa99 (patch) | |
| tree | 17aca55ad50553f58defacb24c377cd8777cf966 /recipes/gcc/gcc-4.4.0/debian/libjava-armel-ldflags.dpatch | |
| parent | 413cc98aa563c9e6104d1104d5b24987ab9d12f8 (diff) | |
| parent | eee57a831f63162a5c40c7ed53805f8d78a058bf (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/gcc/gcc-4.4.0/debian/libjava-armel-ldflags.dpatch')
| -rw-r--r-- | recipes/gcc/gcc-4.4.0/debian/libjava-armel-ldflags.dpatch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/recipes/gcc/gcc-4.4.0/debian/libjava-armel-ldflags.dpatch b/recipes/gcc/gcc-4.4.0/debian/libjava-armel-ldflags.dpatch new file mode 100644 index 0000000000..ecaddb61e0 --- /dev/null +++ b/recipes/gcc/gcc-4.4.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++" + ;; |