diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-07-18 12:28:46 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-07-18 12:28:46 +0000 |
| commit | e8bda8575637b967afaa0321fc3aeb69e809087a (patch) | |
| tree | d4865b2556e227b403f9c13ad128d9bfb3c009d8 /meta/packages/gcc/gcc-4.3.1/debian/libjava-armel-ldflags.dpatch | |
| parent | f204c8376f18d6cc443e7f4533d7eeace5d45f95 (diff) | |
| download | poky-e8bda8575637b967afaa0321fc3aeb69e809087a.tar.gz | |
gcc 4.3.0 -> 4.3.1 (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4876 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gcc/gcc-4.3.1/debian/libjava-armel-ldflags.dpatch')
| -rw-r--r-- | meta/packages/gcc/gcc-4.3.1/debian/libjava-armel-ldflags.dpatch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/packages/gcc/gcc-4.3.1/debian/libjava-armel-ldflags.dpatch b/meta/packages/gcc/gcc-4.3.1/debian/libjava-armel-ldflags.dpatch new file mode 100644 index 0000000000..ecaddb61e0 --- /dev/null +++ b/meta/packages/gcc/gcc-4.3.1/debian/libjava-armel-ldflags.dpatch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | #! /bin/sh -e | ||
| 2 | |||
| 3 | # DP: Adjust libjava extra_ldflags for armel. | ||
| 4 | |||
| 5 | dir= | ||
| 6 | if [ $# -eq 3 -a "$2" = '-d' ]; then | ||
| 7 | pdir="-d $3" | ||
| 8 | dir="$3/" | ||
| 9 | elif [ $# -ne 1 ]; then | ||
| 10 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
| 11 | exit 1 | ||
| 12 | fi | ||
| 13 | case "$1" in | ||
| 14 | -patch) | ||
| 15 | patch $pdir -f --no-backup-if-mismatch -p0 < $0 | ||
| 16 | cd ${dir}libjava && autoconf | ||
| 17 | ;; | ||
| 18 | -unpatch) | ||
| 19 | patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 | ||
| 20 | rm -f ${dir}libjava/configure | ||
| 21 | ;; | ||
| 22 | *) | ||
| 23 | echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" | ||
| 24 | exit 1 | ||
| 25 | esac | ||
| 26 | exit 0 | ||
| 27 | |||
| 28 | --- libjava/configure.ac~ 2008-01-14 15:45:26.698717101 +0100 | ||
| 29 | +++ libjava/configure.ac 2008-01-14 15:47:37.460689616 +0100 | ||
| 30 | @@ -807,7 +807,7 @@ | ||
| 31 | # Some of the ARM unwinder code is actually in libstdc++. We | ||
| 32 | # could in principle replicate it in libgcj, but it's better to | ||
| 33 | # have a dependency on libstdc++. | ||
| 34 | - extra_ldflags='-L$(here)/../libstdc++-v3/src/.libs -lstdc++' | ||
| 35 | + extra_ldflags='-L$(here)/../libstdc++-v3/src -L$(here)/../libstdc++-v3/src/.libs -lstdc++' | ||
| 36 | LIBSTDCXXSPEC=-lstdc++ | ||
| 37 | LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -L`${PWDCMD-pwd}`/../libstdc++-v3/src/.libs -rpath `${PWDCMD-pwd}`/.libs:`${PWDCMD-pwd}`/../libstdc++-v3/src/.libs -lstdc++" | ||
| 38 | ;; | ||
