diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-04-11 10:44:47 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-04-11 10:44:47 +0000 |
| commit | e2ad63e36348a3e534f6f55b902e22d3ad98be30 (patch) | |
| tree | bf085860292d0ca338a2f249aaa06044984e0ba7 /packages/gcc/gcc-4.3.0/debian/libjava-rpath.dpatch | |
| parent | 8f18958d24640e545bedac5f4d6e30b6eef27134 (diff) | |
gcc 4.3.0: add all patches from debian and fedora into their respective subdirs and apply a few.
Diffstat (limited to 'packages/gcc/gcc-4.3.0/debian/libjava-rpath.dpatch')
| -rw-r--r-- | packages/gcc/gcc-4.3.0/debian/libjava-rpath.dpatch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/packages/gcc/gcc-4.3.0/debian/libjava-rpath.dpatch b/packages/gcc/gcc-4.3.0/debian/libjava-rpath.dpatch new file mode 100644 index 0000000000..e9b7f03f5b --- /dev/null +++ b/packages/gcc/gcc-4.3.0/debian/libjava-rpath.dpatch @@ -0,0 +1,49 @@ +#! /bin/sh -e + +# DP: - Link ecjx with -rpath $(dbexecdir) + +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/Makefile.am~ 2007-03-04 18:50:01.000000000 +0100 ++++ libjava/Makefile.am 2007-03-04 19:19:32.000000000 +0100 +@@ -683,7 +683,7 @@ + ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) + endif !ENABLE_SHARED + +-ecjx_LDADD = -L$(here)/.libs libgcj.la ++ecjx_LDADD = -L$(here)/.libs libgcj.la -rpath $(dbexecdir) + ecjx_DEPENDENCIES = libgcj.la libgcj.spec + + else !NATIVE +--- libjava/Makefile.in~ 2007-03-04 18:50:01.000000000 +0100 ++++ libjava/Makefile.in 2007-03-04 19:21:22.000000000 +0100 +@@ -7787,7 +7787,7 @@ + @ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR) + @NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) + @NATIVE_FALSE@ecjx_LDADD = +-@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la ++@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la -rpath $(dbexecdir) + @NATIVE_FALSE@ecjx_DEPENDENCIES = + @NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec + gappletviewer_SOURCES = |