diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-08 10:08:45 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-08 10:08:45 +0200 |
| commit | f77a615dee76f1c6d560b69ec8c1a245bd46f39c (patch) | |
| tree | 8db0ff94871600fd03606f3cd41bd49a9b2d2bf8 /recipes/gcc/gcc-4.4.1/debian/libjava-rpath.dpatch | |
| parent | 076d31f2981d51b093d86b0751121fe1e10669b1 (diff) | |
| parent | a702c1ad0559dd6712857e2e9a8ee82513814569 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/gcc/gcc-4.4.1/debian/libjava-rpath.dpatch')
| -rw-r--r-- | recipes/gcc/gcc-4.4.1/debian/libjava-rpath.dpatch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/recipes/gcc/gcc-4.4.1/debian/libjava-rpath.dpatch b/recipes/gcc/gcc-4.4.1/debian/libjava-rpath.dpatch new file mode 100644 index 0000000000..e9b7f03f5b --- /dev/null +++ b/recipes/gcc/gcc-4.4.1/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 = |