monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 00:07:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9007

Browse source 
c8e4de1 depends: remove kernel version from darwin triplet (tobtoht)
This commit is contained in:
luigi1111 2023-10-25 21:39:24 -04:00
commit 40af6848f2
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/depends.yml vendored
View file

@ -51,10 +51,10 @@ jobs:
host: "x86_64-unknown-linux-gnu" host: "x86_64-unknown-linux-gnu"
packages: "gperf cmake python3-zmq libdbus-1-dev libharfbuzz-dev" packages: "gperf cmake python3-zmq libdbus-1-dev libharfbuzz-dev"
- name: "Cross-Mac x86_64" - name: "Cross-Mac x86_64"
host: "x86_64-apple-darwin11" host: "x86_64-apple-darwin"
packages: "cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git" packages: "cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git"
- name: "Cross-Mac aarch64" - name: "Cross-Mac aarch64"
host: "aarch64-apple-darwin11" host: "aarch64-apple-darwin"
packages: "cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git" packages: "cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git"
- name: "x86_64 Freebsd" - name: "x86_64 Freebsd"
host: "x86_64-unknown-freebsd" host: "x86_64-unknown-freebsd"

2
README.md
View file

@ -565,7 +565,7 @@ You can also cross-compile static binaries on Linux for Windows and macOS with t
* Requires: `python3 g++-mingw-w64-x86-64 wine1.6 bc` * Requires: `python3 g++-mingw-w64-x86-64 wine1.6 bc`
* You also need to run: * You also need to run:
```update-alternatives --set x86_64-w64-mingw32-g++ x86_64-w64-mingw32-g++-posix && update-alternatives --set x86_64-w64-mingw32-gcc x86_64-w64-mingw32-gcc-posix``` ```update-alternatives --set x86_64-w64-mingw32-g++ x86_64-w64-mingw32-g++-posix && update-alternatives --set x86_64-w64-mingw32-gcc x86_64-w64-mingw32-gcc-posix```
* ```make depends target=x86_64-apple-darwin11``` for macOS binaries. * ```make depends target=x86_64-apple-darwin``` for macOS binaries.
* Requires: `cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev` * Requires: `cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev`
* ```make depends target=i686-linux-gnu``` for 32-bit linux binaries. * ```make depends target=i686-linux-gnu``` for 32-bit linux binaries.
* Requires: `g++-multilib bc` * Requires: `g++-multilib bc`

2
contrib/depends/Makefile
View file

@ -185,7 +185,7 @@ install: check-packages $(host_prefix)/share/toolchain.cmake
download-one: check-sources $(all_sources) download-one: check-sources $(all_sources)
download-osx: download-osx:
@$(MAKE) -s HOST=x86_64-apple-darwin11 download-one @$(MAKE) -s HOST=x86_64-apple-darwin download-one
download-linux: download-linux:
@$(MAKE) -s HOST=x86_64-unknown-linux-gnu download-one @$(MAKE) -s HOST=x86_64-unknown-linux-gnu download-one
download-win: download-win:

2
contrib/depends/README.md
View file

@ -32,7 +32,7 @@ Common `host-platform-triplets` for cross compilation are:
- `i686-w64-mingw32` for Win32 - `i686-w64-mingw32` for Win32
- `x86_64-w64-mingw32` for Win64 - `x86_64-w64-mingw32` for Win64
- `x86_64-apple-darwin11` for MacOSX x86_64 - `x86_64-apple-darwin` for MacOSX x86_64
- `arm-linux-gnueabihf` for Linux ARM 32 bit - `arm-linux-gnueabihf` for Linux ARM 32 bit
- `aarch64-linux-gnu` for Linux ARM 64 bit - `aarch64-linux-gnu` for Linux ARM 64 bit
- `riscv64-linux-gnu` for Linux RISCV 64 bit - `riscv64-linux-gnu` for Linux RISCV 64 bit

8
contrib/depends/toolchain.cmake.in
View file

@ -65,15 +65,15 @@ set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # Find includes in target
# specify the cross compiler to be used. Darwin uses clang provided by the SDK. # specify the cross compiler to be used. Darwin uses clang provided by the SDK.
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
if(ARCHITECTURE STREQUAL "aarch64") if(ARCHITECTURE STREQUAL "aarch64")
SET(CLANG_TARGET "arm64-apple-darwin11") SET(CLANG_TARGET "arm64-apple-darwin")
SET(CONF_TRIPLE "aarch64-apple-darwin11") SET(CONF_TRIPLE "aarch64-apple-darwin")
SET(BUILD_TAG "mac-armv8") SET(BUILD_TAG "mac-armv8")
SET(CMAKE_OSX_ARCHITECTURES "arm64") SET(CMAKE_OSX_ARCHITECTURES "arm64")
set(ARM ON) set(ARM ON)
set(ARM_ID "armv8-a") set(ARM_ID "armv8-a")
else() else()
SET(CLANG_TARGET "x86_64-apple-darwin11") SET(CLANG_TARGET "x86_64-apple-darwin")
SET(CONF_TRIPLE "x86_64-apple-darwin11") SET(CONF_TRIPLE "x86_64-apple-darwin")
SET(BUILD_TAG "mac-x64") SET(BUILD_TAG "mac-x64")
SET(CMAKE_OSX_ARCHITECTURES "x86_64") SET(CMAKE_OSX_ARCHITECTURES "x86_64")
endif() endif()

2
contrib/gitian/gitian-osx.yml
View file

@ -29,7 +29,7 @@ remotes:
files: [] files: []
script: | script: |
WRAP_DIR=$HOME/wrapped WRAP_DIR=$HOME/wrapped
HOSTS="x86_64-apple-darwin11 aarch64-apple-darwin11" HOSTS="x86_64-apple-darwin aarch64-apple-darwin"
FAKETIME_HOST_PROGS="" FAKETIME_HOST_PROGS=""
FAKETIME_PROGS="ar ranlib date dmg genisoimage python" FAKETIME_PROGS="ar ranlib date dmg genisoimage python"