diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-01-19 14:12:58 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-01-19 15:00:43 +0100 |
| commit | 1876f09394977e9484f197040271ddab955adc31 (patch) | |
| tree | 2ad06dd01242c5cdabc8a8705f7714b694d15de5 /patches | |
| parent | 597260d4b3dc515190a271f73bc2a051d5bba428 (diff) | |
| download | ptxdist-1876f09394977e9484f197040271ddab955adc31.tar.gz ptxdist-1876f09394977e9484f197040271ddab955adc31.tar.xz | |
dbus-java: new package
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch | 28 | ||||
| -rw-r--r-- | patches/dbus-java-2.7/series | 3 |
2 files changed, 31 insertions, 0 deletions
diff --git a/patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch b/patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch new file mode 100644 index 000000000..7727b1be4 --- /dev/null +++ b/patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch @@ -0,0 +1,28 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 19 Jan 2011 14:01:46 +0100 +Subject: [PATCH] HACK: use $JARPREFIX instead of $JAVAUNIXJARDIR to look for unix.jar at runtime. + +JAVAUNIXJARDIR cannot be used here because it is used at compile time and has +to start with $(SYSROOT). + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 65bff86..ce0b147 100644 +--- a/Makefile ++++ b/Makefile +@@ -141,7 +141,7 @@ doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc + $(DOCBOOKTOMAN) $< > $@ + + bin/%: %.sh .bin +- sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXJARPATH\%,$(JAVAUNIXJARDIR),;s,\%JAVAUNIXLIBPATH\%,$(JAVAUNIXLIBDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),;s,\%JAVA\%,$(JAVA),' < $< > $@ ++ sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXJARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXLIBPATH\%,$(JAVAUNIXLIBDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),;s,\%JAVA\%,$(JAVA),' < $< > $@ + + win/%.bat: %.bat .win + sed 's,\%WINJARPATH\%,$(JARPREFIX),;s,\%WINUNIXJARPATH\%,$(JAVAUNIXJARDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),' < $< > $@ +-- +1.7.2.3 + diff --git a/patches/dbus-java-2.7/series b/patches/dbus-java-2.7/series new file mode 100644 index 000000000..cbca0a209 --- /dev/null +++ b/patches/dbus-java-2.7/series @@ -0,0 +1,3 @@ +# generated by git-ptx-patches +0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch +# 7fe933df14af156789a1d628f11bef0b - git-ptx-patches magic |