------------------------------------------------------------
revno: 600
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk7
timestamp: Mon 2015-11-30 06:31:53 +0100
message:
* Fix stripping packages (use bash instead of expr substring).
added:
patches/sparc-libproc-fix.diff
modified:
changelog
rules
--
lp:~openjdk/openjdk/openjdk7
https://code.launchpad.net/~openjdk/openjdk/openjdk7
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk7.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk7/+edit-subscription
=== modified file 'changelog'
--- changelog 2015-11-26 20:30:42 +0000
+++ changelog 2015-11-30 05:31:53 +0000
@@ -1,3 +1,9 @@
+openjdk-7 (7u91-2.6.3-3) UNRELEASED; urgency=medium
+
+ * Fix stripping packages (use bash instead of expr substring).
+
+ -- Matthias Klose <d...@ubuntu.com> Mon, 30 Nov 2015 06:27:48 +0100
+
openjdk-7 (7u91-2.6.3-2) unstable; urgency=medium
* Enable sparc64 for hotspot (John Paul Adrian Glaubitz).
=== added file 'patches/sparc-libproc-fix.diff'
--- patches/sparc-libproc-fix.diff 1970-01-01 00:00:00 +0000
+++ patches/sparc-libproc-fix.diff 2015-11-30 05:31:53 +0000
@@ -0,0 +1,12 @@
+Index: openjdk/hotspot/agent/src/os/linux/libproc.h
+===================================================================
+--- openjdk/hotspot/agent/src/os/linux/libproc.h.old 2015-11-12 22:57:20.000000000 -0600
++++ openjdk/hotspot/agent/src/os/linux/libproc.h 2015-11-22 10:49:17.684049960 -0600
+@@ -34,6 +34,7 @@
+ #include "libproc_md.h"
+ #endif
+
++#include <asm/ptrace.h>
+ #include <sys/ptrace.h>
+
+ /************************************************************************************
=== modified file 'rules'
--- rules 2015-11-26 20:30:42 +0000
+++ rules 2015-11-30 05:31:53 +0000
@@ -6,6 +6,7 @@
unexport LANG LC_ALL
+# using brace expansion and substring replacements (${var:0:2}).
SHELL = /bin/bash
vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
@@ -2167,17 +2168,30 @@
dh_strip -s $(nodemo) $(nojrec) $(nojrej) $(nojrez) \
-Xlibjvm.so --dbg-package=$(p_dbg)
ifeq (,$(findstring nostrip, $(DEB_BUILD_OPTIONS)))
- set -e; \
- for i in {$(d_jrehl),$(d_jrec),$(d_jrez)}/$(basedir)/jre/lib/$(archdir)/*/libjvm.so; do \
- id=$$(echo $$i | sed -r 's,debian/[^/]+,$(d_dbg)/usr/lib/debug,'); \
+ set -ex; \
+ for i in {$(d_jrehl),$(d_jre),$(d_jrec),$(d_jrez)}/$(basedir)/jre/lib/$(archdir)/*/libjvm.so; do \
[ -f $$i ] || continue; \
- echo strip $$i; \
- mkdir -p $$(dirname $$id); \
- objcopy --only-keep-debug $$i $$id; \
- chmod 644 $$id; \
- strip --remove-section=.comment --remove-section=.note \
- --strip-debug $$i; \
- objcopy --add-gnu-debuglink $$id $$i; \
+ b_id=$$(LC_ALL=C readelf -n $$i | sed -n 's/ *Build ID: *\([0-9a-f][0-9a-f]*\)/\1/p'); \
+ if [ -z "$$b_id" ] || [ "$(dh_version)" -lt 9 ]; then \
+ id=$$(echo $$i | sed -r 's,debian/[^/]+,$(d_dbg)/usr/lib/debug,'); \
+ echo strip $$i; \
+ mkdir -p $$(dirname $$id); \
+ objcopy --only-keep-debug $$i $$id; \
+ chmod 644 $$id; \
+ strip --remove-section=.comment --remove-section=.note \
+ --strip-debug $$i; \
+ objcopy --add-gnu-debuglink $$id $$i; \
+ else \
+ d=$(d_dbg)/usr/lib/debug/.build-id/$${b_id:0:2}; \
+ mkdir -p $$d; \
+ objcopy --only-keep-debug --compress-debug-sections \
+ $$i $$d/$$b_id.debug; \
+ chmod 644 $$d/$$b_id.debug; \
+ strip --remove-section=.comment --remove-section=.note \
+ $$i; \
+ objcopy --add-gnu-debuglink \
+ $$d/$$b_id.debug $$i; \
+ fi; \
done
endif
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
