| 1 |
commit: 14f4e941090ccfcb06925aa64ba1d463ec85e5c5 |
| 2 |
Author: Louis Leseur <louis.leseur <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Feb 25 16:37:37 2021 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 01:39:28 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=14f4e941 |
| 7 |
|
| 8 |
dev-java/icedtea-bin: fix debug symbols issue |
| 9 |
|
| 10 |
Alpine's dbg archive contains splitted debug symbols. |
| 11 |
Merge them back in the original binary and let Portage decide wether to |
| 12 |
let/strip/split them. |
| 13 |
debug useflag not needed anymore. |
| 14 |
|
| 15 |
Closes: https://github.com/gentoo/musl/pull/381 |
| 16 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
| 17 |
Manifest-Sign-Key: 0xA453BA811844AF61 |
| 18 |
Signed-off-by: Louis Leseur <louis.leseur <AT> gmail.com> |
| 19 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 20 |
|
| 21 |
dev-java/icedtea-bin/icedtea-bin-3.18.0.ebuild | 32 ++++++++++++++------------ |
| 22 |
1 file changed, 17 insertions(+), 15 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.18.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.18.0.ebuild |
| 25 |
index da7b1c8..234dba7 100644 |
| 26 |
--- a/dev-java/icedtea-bin/icedtea-bin-3.18.0.ebuild |
| 27 |
+++ b/dev-java/icedtea-bin/icedtea-bin-3.18.0.ebuild |
| 28 |
@@ -3,7 +3,7 @@ |
| 29 |
|
| 30 |
EAPI=6 |
| 31 |
|
| 32 |
-inherit java-vm-2 toolchain-funcs multilib-build |
| 33 |
+inherit java-vm-2 toolchain-funcs multilib-build estack |
| 34 |
|
| 35 |
ALPINE_PN="openjdk8" |
| 36 |
ALPINE_PV="8.282.08-r0" |
| 37 |
@@ -19,8 +19,8 @@ get_apk_names() { |
| 38 |
${BASE_URI}/${ARCH}/${ALPINE_PN}-jre-base-${ALPINE_PV}.apk -> ${PF}-jre-base-${ARCH}.tar.gz |
| 39 |
${BASE_URI}/${ARCH}/${ALPINE_PN}-jre-lib-${ALPINE_PV}.apk -> ${PF}-jre-lib-${ARCH}.tar.gz |
| 40 |
${BASE_URI}/${ARCH}/${ALPINE_PN}-doc-${ALPINE_PV}.apk -> ${PF}-doc-${ARCH}.tar.gz |
| 41 |
+ ${BASE_URI}/${ARCH}/${ALPINE_PN}-dbg-${ALPINE_PV}.apk -> ${PF}-dbg-${ARCH}.tar.gz |
| 42 |
examples? ( ${BASE_URI}/${ARCH}/${ALPINE_PN}-demos-${ALPINE_PV}.apk -> ${PF}-demos-${ARCH}.tar.gz ) |
| 43 |
- debug? ( ${BASE_URI}/${ARCH}/${ALPINE_PN}-dbg-${ALPINE_PV}.apk -> ${PF}-dbg-${ARCH}.tar.gz ) |
| 44 |
)" |
| 45 |
} |
| 46 |
|
| 47 |
@@ -40,18 +40,19 @@ SRC_URI=" |
| 48 |
LICENSE="GPL-2-with-classpath-exception" |
| 49 |
SLOT="8" |
| 50 |
KEYWORDS="-* amd64 arm arm64 ppc64 x86" |
| 51 |
-IUSE="big-endian elibc_musl cups +gtk pulseaudio selinux debug examples alsa headless-awt" |
| 52 |
+IUSE="big-endian elibc_musl cups +gtk pulseaudio selinux examples alsa headless-awt" |
| 53 |
|
| 54 |
REQUIRED_USE=" |
| 55 |
gtk? ( !headless-awt ) |
| 56 |
ppc64? ( !big-endian ) |
| 57 |
elibc_musl |
| 58 |
" |
| 59 |
-RESTRICT="preserve-libs strip mirror" |
| 60 |
+RESTRICT="preserve-libs mirror" |
| 61 |
QA_PREBUILT="opt/.*" |
| 62 |
|
| 63 |
RDEPEND="" |
| 64 |
DEPEND=" |
| 65 |
+ dev-libs/elfutils[utils] |
| 66 |
>=dev-libs/glib-2.60.7:2 |
| 67 |
>=media-libs/fontconfig-2.13:1.0 |
| 68 |
>=media-libs/freetype-2.9.1:2 |
| 69 |
@@ -102,17 +103,18 @@ src_unpack() { |
| 70 |
src_prepare() { |
| 71 |
default |
| 72 |
|
| 73 |
- # Overwrite normal binaries with the ones with debug symbols |
| 74 |
- if use debug; then |
| 75 |
- # Remove .debug extension |
| 76 |
- shopt -s globstar |
| 77 |
- for file in usr/lib/debug/**/*.debug; do |
| 78 |
- mv "${file}" "${file%.debug}" || die |
| 79 |
- done |
| 80 |
- shopt -u globstar |
| 81 |
- cp -r usr/lib/debug/usr . || die |
| 82 |
- rm -rv usr/lib/debug || die |
| 83 |
- fi |
| 84 |
+ # Unsplit debug symbols from the binaries |
| 85 |
+ strip_dir="${S}" |
| 86 |
+ debug_dir="${S}/debug" |
| 87 |
+ mv -v usr/lib/debug "${debug_dir}" || die |
| 88 |
+ cd "${debug_dir}" || die |
| 89 |
+ eshopts_push -s globstar |
| 90 |
+ for debug in **/*.debug; do |
| 91 |
+ bin="${strip_dir}/${debug%.debug}" |
| 92 |
+ eu-unstrip -o "${bin}" "${bin}" "${debug}" || die |
| 93 |
+ done |
| 94 |
+ eshopts_pop |
| 95 |
+ cd - || die |
| 96 |
|
| 97 |
if ! use alsa; then |
| 98 |
rm -v "${ALPINE_PATH}"/jre/lib/*/libjsoundalsa.* || die |
Archives