Create aarch64-apple-darwin build script. #236

usiegl00 · 2022-10-21T09:09:12Z

This adds a build script and changes the required files to build mettle targeting aarch64-apple-darwin.
Usage: bash build_m1.sh

See: rapid7/metasploit-framework#17129

adfoster-r7

It looks like @space-r7 has noticed a similar PR from @Ishaanahuja7 which has made some similar and different changes over here: #237

It'd be cool if there's anything that needs collaborating over for that to land in this PR 🎉

adfoster-r7 · 2022-11-03T14:52:25Z

build_m1.sh

+cp deps/config.sub mettle/config.sub
+make TARGET=aarch64-apple-darwin
+cd build/aarch64-apple-darwin/json-c/ && autoreconf -fiv && cd ../../..
+make TARGET=aarch64-apple-darwin
+cp darwin_sigar.c build/aarch64-apple-darwin/libsigar/src/os/darwin/darwin_sigar.c 
+make TARGET=aarch64-apple-darwin
+cd build/aarch64-apple-darwin/libdnet/ && autoreconf -fiv && cd ../../..
+make TARGET=aarch64-apple-darwin


I don't think this is needed if we modify the top level ARCHES file, which should get pulled in automagically to the Makefile + build process over here:

mettle/Makefile

Lines 14 to 41 in bf5a4be

ARCHES := $(shell cat ARCHES)

# Create the individual build/clean/dist-clean rules for each arch...

define rules_for_each_arch

$(strip $(1)).build: $(TOOLS)/musl-cross/.unpacked $(ROOT)/mettle/configure

make TARGET=$(strip $(1))

$(strip $(1)).install:

make TARGET=$(strip $(1)) install

$(strip $(1)).clean:

make TARGET=$(strip $(1)) clean

$(strip $(1)).distclean:

make TARGET=$(strip $(1)) distclean

endef

$(foreach a, $(ARCHES), $(eval $(call rules_for_each_arch, $(strip $(a)))))

all-parallel: $(TOOLS) $(patsubst %,%.build,$(ARCHES))

clean-parallel: $(patsubst %,%.clean,$(ARCHES))

distclean-parallel: $(patsubst %,%.distclean,$(ARCHES))

install-parallel: $(patsubst %,%.install,$(ARCHES))

adfoster-r7 · 2022-11-03T14:52:59Z

darwin_sigar.c

@@ -0,0 +1,2772 @@
+/*


I believe the sigar dependency is actually pulled in from over here https://github.com/rapid7/sigar

If this new darwin_sigar file is the same content as what's in the rapid7/sigar#1
PR, I think we'd be able to merge that in, or you could create a new pull request if there's additional changes to make 👍

Ishaanahuja7 · 2022-11-05T17:50:25Z

Hi @adfoster-r7 @usiegl00 I have opened a PR in rapid7/sigar with the fixed changes for darwin_sigar.c and in my PR for this repo also added darwin and iphone targets in ARCHES #237, rapid7/sigar#2

…e-darwin This integrates Ishaanahuja7's changes with usiegl00s and enables building for the aarch64-apple-darwin target.

usiegl00 · 2022-11-05T23:34:36Z

@Ishaanahuja7 I have incorporated your changes and separated out the cam and mic additions for a later pr. Thanks for the assist!
@adfoster-r7 This pr is ready to be merged and building normally with make TARGET=aarch64-apple-darwin on my machine.

jmartin-tech · 2022-11-07T13:33:42Z

@usiegl00 as noted in #237 (comment) the changes to sigar need to land and will be packaged for inclusion from a tagged release which can then be added to this PR. darwin_sigar.c and changes to the make file that copy it over the extraction will need to be removed.

space-r7 · 2022-11-29T22:30:40Z

make/Makefile.libsigar

@@ -11,6 +11,7 @@ $(BUILD)/libsigar/Makefile: $(TOOLS) $(BUILD)/libsigar/configure
 	@mkdir -p $(BUILD)/libsigar
 	@$(SETUP_BUILDENV) cd $(BUILD)/libsigar; \
 		$(CONFIG_FIXUP) \
+		cp $(DEPS)/darwin_sigar.c src/os/darwin; \


This line and the darwin_sigar.c file should be removed since a PR was added to the sigar repository

jmartin-tech · 2022-11-30T15:35:09Z

ARCHES

+i386-apple-darwin
+x86_64-apple-darwin
+aarch64-apple-darwin


Sorry for the confusion, darwin tuples are not currently built using the ARCHES pattern. Currently the ARCHES list builds only artifacts that can be cross compiled using a linux build system.

The gem build process currently calls the following in a macOS VM with Xcode available.

make TARGET=x86_64-apple-darwin make TARGET=arm-iphone-darwin make TARGET=aarch64-iphone-darwin

I do like the idea of having all supported tuples in the ARCHES file however the Makefile would need to be updated to either detect the running OS and skip darwin when run on a linux platform or darwin tuples need to be a separate file.

Note if removing is the path the other darwin added targets for iphone at the end of the file are also not compilable on Linux.

jmartin-tech · 2023-03-02T22:20:39Z

Closing this as all changes here are believed to have been incorporated in #237.

The framework PR referenced should be able to move forward utilizing the latest released gem for v1.0.23

usiegl00 · 2023-03-02T23:42:36Z

Thank you @Ishaanahuja7 and @jmartin-r7!

usiegl00 and others added 7 commits October 21, 2022 18:05

Create aarch64-apple-darwin build script.

6f927f3

Add files via upload

c9c3f0b

Add files via upload

aeb94a0

Update Makefile.json-c

43335ee

Update Makefile.libsigar

da7fc65

Update apple_mic.m

7529b06

Update apple_webcam.m

38a3067

space-r7 mentioned this pull request Nov 3, 2022

Added Apple Silicon (M1 & M2) and fixed macOS builds #237

Merged

adfoster-r7 reviewed Nov 3, 2022

View reviewed changes

Ishaanahuja7 added 2 commits November 5, 2022 22:59

Update ARCHES

872a764

Update darwin_sigar.c

2a2a77d

Ishaanahuja7 and others added 5 commits November 6, 2022 03:24

Update darwin_sigar.c

e76c263

Update apple_mic.m

4b3e5b8

Update apple_webcam.m

fc05835

Update apple_mic.m

5d45912

Merge branch 'ishaanahuja7_aarch64-mac-build-fixup' into aarch64-appl…

cd67893

…e-darwin This integrates Ishaanahuja7's changes with usiegl00s and enables building for the aarch64-apple-darwin target.

space-r7 reviewed Nov 29, 2022

View reviewed changes

Remove darwin_sigar.c as sigar was updated.

fc6bb49

jmartin-tech reviewed Nov 30, 2022

View reviewed changes

usiegl00 added 2 commits December 1, 2022 11:38

Revert additions to ARCHES.

1a96cc8

Further revert additions to ARCHES.

e7dedd0

jmartin-tech closed this Mar 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create aarch64-apple-darwin build script. #236

Create aarch64-apple-darwin build script. #236

usiegl00 commented Oct 21, 2022 •

edited by adfoster-r7

Loading

adfoster-r7 left a comment

adfoster-r7 Nov 3, 2022

adfoster-r7 Nov 3, 2022 •

edited

Loading

Ishaanahuja7 commented Nov 5, 2022

usiegl00 commented Nov 5, 2022

jmartin-tech commented Nov 7, 2022

space-r7 Nov 29, 2022

jmartin-tech Nov 30, 2022

jmartin-tech Dec 1, 2022

jmartin-tech commented Mar 2, 2023

usiegl00 commented Mar 2, 2023

	ARCHES := $(shell cat ARCHES)

	# Create the individual build/clean/dist-clean rules for each arch...
	define rules_for_each_arch

	$(strip $(1)).build: $(TOOLS)/musl-cross/.unpacked $(ROOT)/mettle/configure
	make TARGET=$(strip $(1))

	$(strip $(1)).install:
	make TARGET=$(strip $(1)) install

	$(strip $(1)).clean:
	make TARGET=$(strip $(1)) clean

	$(strip $(1)).distclean:
	make TARGET=$(strip $(1)) distclean

	endef

	$(foreach a, $(ARCHES), $(eval $(call rules_for_each_arch, $(strip $(a)))))

	all-parallel: $(TOOLS) $(patsubst %,%.build,$(ARCHES))

	clean-parallel: $(patsubst %,%.clean,$(ARCHES))

	distclean-parallel: $(patsubst %,%.distclean,$(ARCHES))

	install-parallel: $(patsubst %,%.install,$(ARCHES))

Create aarch64-apple-darwin build script. #236

Create aarch64-apple-darwin build script. #236

Conversation

usiegl00 commented Oct 21, 2022 • edited by adfoster-r7 Loading

adfoster-r7 left a comment

Choose a reason for hiding this comment

adfoster-r7 Nov 3, 2022

Choose a reason for hiding this comment

adfoster-r7 Nov 3, 2022 • edited Loading

Choose a reason for hiding this comment

Ishaanahuja7 commented Nov 5, 2022

usiegl00 commented Nov 5, 2022

jmartin-tech commented Nov 7, 2022

space-r7 Nov 29, 2022

Choose a reason for hiding this comment

jmartin-tech Nov 30, 2022

Choose a reason for hiding this comment

jmartin-tech Dec 1, 2022

Choose a reason for hiding this comment

jmartin-tech commented Mar 2, 2023

usiegl00 commented Mar 2, 2023

usiegl00 commented Oct 21, 2022 •

edited by adfoster-r7

Loading

adfoster-r7 Nov 3, 2022 •

edited

Loading