Skip to content

Newpkg: search and rescue 2 (draft before pushing to termux-packages)#2149

Open
IntinteDAO wants to merge 1 commit intotermux-user-repository:masterfrom
IntinteDAO:sar2
Open

Newpkg: search and rescue 2 (draft before pushing to termux-packages)#2149
IntinteDAO wants to merge 1 commit intotermux-user-repository:masterfrom
IntinteDAO:sar2

Conversation

@IntinteDAO
Copy link
Copy Markdown
Contributor

The game should work without any problems. It is possible that the “fix_sconstruct.patch” file should be split into several smaller ones.

I must admit that I have never used scons, so I don't know if it can be written more elegantly. However, it works :) I will definitely work on it, because the serf package also uses scons, but it installs everything in termux_step_make_install.

@@ -0,0 +1,6 @@
TERMUX_SUBPKG_DESCRIPTION="Data files for search and rescue 2 (metapackage)"
TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true
TERMUX_SUBPKG_DEPEND_ON_PARENT=no
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line has no effect for 2 reasons:

  1. it would be false instead of no
  2. There is code that automatically makes TERMUX_SUBPKG_DEPEND_ON_PARENT=false when the subpackage is in TERMUX_PKG_DEPENDS of the parent package so you don't need to specify this anyway

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also this is not technically a "metapackage" so maybe the description should be adjusted to remove that

+ '-Wl,-rpath,' + sys_prefix + '/lib',
+ '-Wl,--enable-new-dtags',
+ '-landroid-spawn',
+ '-Wl,--no-as-needed,-lOpenSLES,--as-needed'
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it's possible to get LDFLAGS using os.environ.get() like you did for PREFIX instead of having to write -landroid-spawn, etc. twice?

Also, similar for CPPFLAGS,

Also, For PREFIX itself, I recommend writing this: @TERMUX_PREFIX@ instead of os.environ.get('PREFIX' because @TERMUX_PREFIX@ will be automatically replaced in .patch files for slightly less code required, but that's up to you

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants