Github messages for voidlinux
 help / color / mirror / Atom feed
From: unspecd <unspecd@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: android-studio: update to 4.1.3.
Date: Mon, 29 Mar 2021 23:04:58 +0200	[thread overview]
Message-ID: <20210329210458.9NLUGuKkk6Et6OQWHZVtEWHxL8JQKwl6R0VQZ42OLEQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29858@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/29858#issuecomment-809713511

Comment:
There is a possibility to skip runtime dependency on `openjdk` (due to NEEDED libawt.so, libawt_xawt.so, libjava.so, libjvm.so, libjli.so, which are bundled with the package). Here are the changes I'd like to propose.

File: common/hooks/pre-pkg/04-generate-runtime-deps.sh
```diff
@@ -93,11 +93,14 @@ hook() {
     # above, the mapping is done thru the common/shlibs file.
     #
     for f in ${verify_deps}; do
-        unset _f j rdep _rdep rdepcnt soname _pkgname _rdepver found
+        unset _f j rdep _rdep rdepcnt soname _pkgname _rdepver found skipso
         _f=$(echo "$f"|sed -E 's|\+|\\+|g')
         rdep="$(grep -E "^${_f}[[:blank:]]+.*$" $mapshlibs|cut -d ' ' -f2)"
         rdepcnt="$(grep -E "^${_f}[[:blank:]]+.*$" $mapshlibs|cut -d ' ' -f2|wc -l)"
-        if [ -z "$rdep" ]; then
+        if [[ "${skipsorequires}" == *"$f"* ]]; then
+                skipso=1
+        fi
+        if [ -z "$rdep" -o "$skipso" ]; then
             # Ignore libs by current pkg
             soname=$(find ${PKGDESTDIR} -name "$f")
             if [ -z "$soname" ]; then
```
File: srcpkgs/android-studio/template
```diff
@@ -24,6 +24,8 @@ nopie=yes
 nostrip=yes
 noshlibprovides=yes
 
+# jdk is bundled with the package.
+skipsorequires="libawt.so libawt_xawt.so libjava.so libjvm.so libjli.so"
 # These files are not run or loaded on the host thus skip scanning their runtime deps
 skiprdeps="/opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_probes
```


  reply	other threads:[~2021-03-29 21:04 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-29 21:04 [PR PATCH] " unspecd
2021-03-29 21:04 ` unspecd [this message]
2021-03-29 21:26 ` unspecd
2021-03-30 17:38 ` ericonr
2021-03-30 18:59 ` Chocimier
2021-03-30 23:14 ` [PR PATCH] [Updated] " unspecd
2021-04-01 14:31 ` ericonr
2021-04-01 14:31 ` [PR PATCH] [Merged]: " ericonr
2021-04-02  0:54 ` unspecd

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210329210458.9NLUGuKkk6Et6OQWHZVtEWHxL8JQKwl6R0VQZ42OLEQ@z \
    --to=unspecd@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).