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-rpath.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-rpath.dpatch')
| -rw-r--r-- | meta/packages/gcc/gcc-4.3.1/debian/libjava-rpath.dpatch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/packages/gcc/gcc-4.3.1/debian/libjava-rpath.dpatch b/meta/packages/gcc/gcc-4.3.1/debian/libjava-rpath.dpatch new file mode 100644 index 0000000000..e9b7f03f5b --- /dev/null +++ b/meta/packages/gcc/gcc-4.3.1/debian/libjava-rpath.dpatch | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | #! /bin/sh -e | ||
| 2 | |||
| 3 | # DP: - Link ecjx with -rpath $(dbexecdir) | ||
| 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/Makefile.am~ 2007-03-04 18:50:01.000000000 +0100 | ||
| 29 | +++ libjava/Makefile.am 2007-03-04 19:19:32.000000000 +0100 | ||
| 30 | @@ -683,7 +683,7 @@ | ||
| 31 | ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) | ||
| 32 | endif !ENABLE_SHARED | ||
| 33 | |||
| 34 | -ecjx_LDADD = -L$(here)/.libs libgcj.la | ||
| 35 | +ecjx_LDADD = -L$(here)/.libs libgcj.la -rpath $(dbexecdir) | ||
| 36 | ecjx_DEPENDENCIES = libgcj.la libgcj.spec | ||
| 37 | |||
| 38 | else !NATIVE | ||
| 39 | --- libjava/Makefile.in~ 2007-03-04 18:50:01.000000000 +0100 | ||
| 40 | +++ libjava/Makefile.in 2007-03-04 19:21:22.000000000 +0100 | ||
| 41 | @@ -7787,7 +7787,7 @@ | ||
| 42 | @ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR) | ||
| 43 | @NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) | ||
| 44 | @NATIVE_FALSE@ecjx_LDADD = | ||
| 45 | -@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la | ||
| 46 | +@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la -rpath $(dbexecdir) | ||
| 47 | @NATIVE_FALSE@ecjx_DEPENDENCIES = | ||
| 48 | @NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec | ||
| 49 | gappletviewer_SOURCES = | ||
