Rizin as subproject dist #4684

amibranch · 2024-10-22T16:26:47Z

Your checklist for this pull request

I've read the guidelines for contributing to this repository
I made sure to follow the project's coding style
I've documented or updated the documentation of every function and struct this PR changes. If not so I've explained why.
I've added tests that prove my fix is effective or that my feature works (if possible)
I've updated the rizin book with the relevant information (if needed)

Detailed description

PR to replace:

Test plan

CI is green

Closing issues

Partially addresses #3454

amibranch · 2024-10-23T06:41:57Z

Note:

Will add gnu99 to PCRE2 to fix builds on CentOS and Debian in next push
Will add gnu99 to rzqnx to fix static build

amibranch · 2024-10-23T07:24:33Z

Note:

* Will add `gnu99` to PCRE2 to fix builds on CentOS and Debian in next push

* Will add `gnu99` to rzqnx to fix static build

Same for tree-sitter

amibranch · 2024-10-23T08:10:31Z

...
Same for tree-sitter

Same for xz/Libzlma and rzgdb

amibranch · 2024-10-23T09:40:29Z

To any potential reviewer:
The cc.has_argument('--std=***')-changes still need some cleanups and the branch must be rebased. Will update this PR, as soon as CI approves

amibranch · 2024-10-23T10:41:21Z

To any potential reviewer: The cc.has_argument('--std=***')-changes still need some cleanups and the branch must be rebased. Will update this PR, as soon as CI approves

Done so far. PR is ready for review

XVilka

Great job! I am blocking this first to push to the internal branch first so that even more CI jobs are triggered. If they pass - I think it's mergeable almost as is. Please squash your (and mine, if necessary) commits to be self-descriptive and/or self-contained.

#4686

XVilka · 2024-10-23T12:22:38Z

meson.build

@@ -355,7 +359,7 @@ foreach it : ccs
  have_pthread = it_th.found() and it_machine.system() != 'windows'
  if it_machine.system() == 'sunos'
    # workaround for Solaris until https://github.com/mesonbuild/meson/issues/4328 is fixed


Remove the comment also then.

@thestr4ng3r take a look at this one please

Can't test unfortunately. Seems my solaris disk is not in the server and I have no physical access at the moment. But from manual review, this looks good and likely we can remove this workaround entirely in another patch independently of this pr.

XVilka · 2024-10-23T13:37:19Z

@amibranch all additional CI jobs passed flawlessly. Lets wait for more reviews and it's ready to be merged, IMHO. Just squash your commits.

amibranch · 2024-10-23T15:16:35Z

Squashed commits into one - awaiting reviews

wargio

seems ok on linux.

XVilka · 2024-10-25T06:15:35Z

@amibranch please rebase again and make a commit message to follow the common commit convention: https://www.conventionalcommits.org

As for the review, now only waiting for @thestr4ng3r to respond about the Solaris changes. After that is sorted out - it's good to merge.

* Setting GNU99/C99 standard for subprojects * Remove use of `add_global_arguments` * Added extern "C" linkage specification to some public headers of rizin * Changed the meson_git_wrapper.py-script to explicitly specify the output-path * Made the RIZIN_BUILD_PATH conditional in the integration-test meson-build

thestr4ng3r · 2024-10-26T16:38:59Z

Linking failure on OpenBSD/sparc64, but this seems unrelated, doesn't it?
openbsd-sparc64-link.txt

amibranch · 2024-10-27T11:56:06Z

cc -Ilibrz/arch/librz_arch.so.0.8.0.p -I. -I.. -Ilibrz -I../librz -Ilibrz/include -I../librz/include -I../librz/arch/isa -I../librz/arch/isa_gnu -Ilibrz/arch -I../librz/arch -Ilibrz/util/sdb/src -I../librz/util/sdb/src -I../librz/bin/format -I../librz/type/parser -I../subprojects/capstone-next/include -I../subprojects/capstone-next/include/capstone -Isubprojects/rzspp -I../subprojects/rzspp -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Werror -O3 --std=gnu99 -Werror=sizeof-pointer-memaccess -Wimplicit-fallthrough=3 -fvisibility=hidden -DRZ_PLUGIN_INCORE=1 -DSUPPORTS_PCRE2_JIT -D_GNU_SOURCE -Wno-cpp -fPIC -MD -MQ librz/arch/librz_arch.so.0.8.0.p/isa_arm_arm_il32.c.o -MF librz/arch/librz_arch.so.0.8.0.p/isa_arm_arm_il32.c.o.d -o librz/arch/librz_arch.so.0.8.0.p/isa_arm_arm_il32.c.o -c ../librz/arch/isa/arm/arm_il32.c
../librz/arch/isa/arm/arm_il32.c:8:32: error: unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas]
    8 | #pragma GCC diagnostic ignored "-Wenum-conversion"
      |                                ^~~~~~~~~~~~~~~~~~~

Not sure what changed the behavior of the CI here. Will investigate and rebase if necessary

Update:
NVM - found #4662 (comment)

XVilka · 2024-10-27T12:01:14Z

cc -Ilibrz/arch/librz_arch.so.0.8.0.p -I. -I.. -Ilibrz -I../librz -Ilibrz/include -I../librz/include -I../librz/arch/isa -I../librz/arch/isa_gnu -Ilibrz/arch -I../librz/arch -Ilibrz/util/sdb/src -I../librz/util/sdb/src -I../librz/bin/format -I../librz/type/parser -I../subprojects/capstone-next/include -I../subprojects/capstone-next/include/capstone -Isubprojects/rzspp -I../subprojects/rzspp -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Werror -O3 --std=gnu99 -Werror=sizeof-pointer-memaccess -Wimplicit-fallthrough=3 -fvisibility=hidden -DRZ_PLUGIN_INCORE=1 -DSUPPORTS_PCRE2_JIT -D_GNU_SOURCE -Wno-cpp -fPIC -MD -MQ librz/arch/librz_arch.so.0.8.0.p/isa_arm_arm_il32.c.o -MF librz/arch/librz_arch.so.0.8.0.p/isa_arm_arm_il32.c.o.d -o librz/arch/librz_arch.so.0.8.0.p/isa_arm_arm_il32.c.o -c ../librz/arch/isa/arm/arm_il32.c
../librz/arch/isa/arm/arm_il32.c:8:32: error: unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas]
    8 | #pragma GCC diagnostic ignored "-Wenum-conversion"
      |                                ^~~~~~~~~~~~~~~~~~~

Not sure what changed the behavior of the CI here. Will investigate and rebase if necessary

Update: NVM - found #4662 (comment)

Yes, we will merge after #4691 (when it's updated to fix remaining issues) to make CI happy.

amibranch requested review from yossizap, ret2libc, wargio, XVilka, kazarmy and thestr4ng3r as code owners October 22, 2024 16:26

github-actions bot added rz-test API buildsystem WinDbg labels Oct 22, 2024

amibranch force-pushed the rizin_as_subproject-dist branch from 3a52010 to 620549e Compare October 22, 2024 16:31

amibranch mentioned this pull request Oct 22, 2024

Rizin as subproject #4679

Closed

5 tasks

amibranch force-pushed the rizin_as_subproject-dist branch from 620549e to f11274e Compare October 22, 2024 16:35

amibranch mentioned this pull request Oct 22, 2024

meson: do not use add_global_arguments() #3706

Closed

5 tasks

amibranch force-pushed the rizin_as_subproject-dist branch 2 times, most recently from beea4e0 to 3eccf1b Compare October 22, 2024 19:01

amibranch force-pushed the rizin_as_subproject-dist branch from 3eccf1b to eeb0889 Compare October 23, 2024 06:58

amibranch force-pushed the rizin_as_subproject-dist branch from eeb0889 to 2b9d7db Compare October 23, 2024 07:32

amibranch force-pushed the rizin_as_subproject-dist branch 2 times, most recently from 3c69d33 to d7db846 Compare October 23, 2024 08:24

github-actions bot added the GDB label Oct 23, 2024

amibranch force-pushed the rizin_as_subproject-dist branch from d7db846 to 13aac19 Compare October 23, 2024 10:37

XVilka requested changes Oct 23, 2024

View reviewed changes

amibranch force-pushed the rizin_as_subproject-dist branch from 13aac19 to 38a719c Compare October 23, 2024 15:15

XVilka approved these changes Oct 23, 2024

View reviewed changes

amibranch force-pushed the rizin_as_subproject-dist branch from 38a719c to 6018188 Compare October 23, 2024 18:18

wargio approved these changes Oct 24, 2024

View reviewed changes

amibranch force-pushed the rizin_as_subproject-dist branch from 6018188 to ef04796 Compare October 25, 2024 06:25

XVilka assigned thestr4ng3r Oct 26, 2024

thestr4ng3r approved these changes Oct 26, 2024

View reviewed changes

XVilka added the merge-when-green label Oct 27, 2024

Merge branch 'dev' into rizin_as_subproject-dist

1c44b40

XVilka merged commit 8e6b764 into rizinorg:dev Oct 29, 2024
52 checks passed

amibranch mentioned this pull request Nov 3, 2024

Fix meson-build global_arguments #4698

Merged

5 tasks

amibranch deleted the rizin_as_subproject-dist branch November 3, 2024 19:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rizin as subproject dist #4684

Rizin as subproject dist #4684

amibranch commented Oct 22, 2024 •

edited by XVilka

Loading

amibranch commented Oct 23, 2024 •

edited

Loading

amibranch commented Oct 23, 2024

amibranch commented Oct 23, 2024 •

edited

Loading

amibranch commented Oct 23, 2024

amibranch commented Oct 23, 2024

XVilka left a comment •

edited

Loading

XVilka Oct 23, 2024

XVilka Oct 23, 2024

thestr4ng3r Oct 26, 2024

XVilka commented Oct 23, 2024

amibranch commented Oct 23, 2024

wargio left a comment

XVilka commented Oct 25, 2024

thestr4ng3r commented Oct 26, 2024

amibranch commented Oct 27, 2024 •

edited

Loading

XVilka commented Oct 27, 2024

Rizin as subproject dist #4684

Rizin as subproject dist #4684

Conversation

amibranch commented Oct 22, 2024 • edited by XVilka Loading

amibranch commented Oct 23, 2024 • edited Loading

amibranch commented Oct 23, 2024

amibranch commented Oct 23, 2024 • edited Loading

amibranch commented Oct 23, 2024

amibranch commented Oct 23, 2024

XVilka left a comment • edited Loading

Choose a reason for hiding this comment

XVilka Oct 23, 2024

Choose a reason for hiding this comment

XVilka Oct 23, 2024

Choose a reason for hiding this comment

thestr4ng3r Oct 26, 2024

Choose a reason for hiding this comment

XVilka commented Oct 23, 2024

amibranch commented Oct 23, 2024

wargio left a comment

Choose a reason for hiding this comment

XVilka commented Oct 25, 2024

thestr4ng3r commented Oct 26, 2024

amibranch commented Oct 27, 2024 • edited Loading

XVilka commented Oct 27, 2024

amibranch commented Oct 22, 2024 •

edited by XVilka

Loading

amibranch commented Oct 23, 2024 •

edited

Loading

amibranch commented Oct 23, 2024 •

edited

Loading

XVilka left a comment •

edited

Loading

amibranch commented Oct 27, 2024 •

edited

Loading