Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Framework: add spksrc.main-depends.mk #5881

Merged
merged 2 commits into from
Sep 14, 2023

Conversation

hgy59
Copy link
Contributor

@hgy59 hgy59 commented Sep 14, 2023

Description

This framework cleanup is ahead of the next synocli-develop update.
It simplifies the dummy cross modules that are built for dependency evaluation only.

Type of change

  • Includes small framework changes

- add mk/spksrc.main-depends.mk to unify Makefile(s) for dependency evaluation
- replace spksrc.install-resources.mk by spksrc.main-depends.mk for all such dummy packages
- enable make all-supported for such Makefile(s)
- remove obsolete PLIST and digests files
@hgy59 hgy59 requested a review from th0ma7 September 14, 2023 12:57
@hgy59
Copy link
Contributor Author

hgy59 commented Sep 14, 2023

@th0ma7 can I merge this?
It is an extract of my work on updating synocli-devel with targets for qoirq and OLD_PPC_ARCHS.

I don't know why the build fails to download nasm (for ffmpeg et. al.) since locally I have no problem to download https://fossies.org/linux/misc/nasm-2.16.01.tar.xz.

Copy link
Contributor

@th0ma7 th0ma7 left a comment

Choose a reason for hiding this comment

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

Besides the REAL_CONFIGURE_ARGS that I'm not sure of, LGTM. Overall looks like a neat idea. If I get this right, as the spksrc.main-depends.mk only has pre-check, cross-env and depend it makes the dependency analysis faster?

Side note, I'd rather use another naming than main and main-depends but I have no better option to offer... so perhaps for a later time.

@$(MSG) - Configure ARGS: $(CONFIGURE_ARGS)
@$(MSG) - Configure ARGS: $(REAL_CONFIGURE_ARGS)
Copy link
Contributor

Choose a reason for hiding this comment

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

Really? isn't REAL_CONFIGURE_ARGS related to GNU_CONFIGURE only?

Copy link
Contributor Author

@hgy59 hgy59 Sep 14, 2023

Choose a reason for hiding this comment

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

REAL_CONFIGURE_ARGS contains all configure args

with GNU_CONFIGURE = 1, it contains the --host, --build and --prefix args
and it contains the TC_CONFIGURE_ARGS
plus for DSM 7+ it has --localstatedir defined

without GNU_CONFIGURE it is the same as CONFIGURE_ARGS.

EDIT: the default configure target always uses REAL_CONFIGURE_ARGS.

I changed the message to REAL_CONFIGURE_ARGS after I found in cross/gdb-7.12/Makefile there is GNU_CONFIGURE = 1, but finally only CONFIGURE_ARGS are used and the REAL_CONFIGURE_ARGS logic is implemented again.

Is is only confusing with custom configure targets, but this is always the case with a common pre-target message.
Custom configure targets should always add own messages to avoid confusion (when not using REAL_CONDIGURE_ARGS).

@hgy59
Copy link
Contributor Author

hgy59 commented Sep 14, 2023

Side note, I'd rather use another naming than main and main-depends but I have no better option to offer... so perhaps for a later time.

My first approach was spksrc.no-op.mk, then spksrc.evaluate-depends.mk and finally spksrc.main-depends.mk based on your naming (*-main) for the PKG_NAME 😄

EDIT:
another idea was spksrc.cross-depends.mk, but cross would only stand for the cross folder and has nothing to do with cross compilation (like cross-cc, cross-cmake, ...)

@th0ma7
Copy link
Contributor

th0ma7 commented Sep 14, 2023

My first approach was spksrc.no-op.mk, then spksrc.evaluate-depends.mk and finally spksrc.main-depends.mk based on your naming (*-main) for the PKG_NAME 😄

I must be getting old... yet another senior moment 👴

@hgy59 hgy59 merged commit d3e59de into SynoCommunity:master Sep 14, 2023
5 of 17 checks passed
@hgy59 hgy59 deleted the framework_add_main-depends branch September 14, 2023 21:56
@hgy59 hgy59 mentioned this pull request Sep 16, 2023
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants