LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #12474: [depends] Allow depends system to support armv7l

Browse source 
ac91ea6 [depends] Allow depends system to support armv7l (Henrik Jonsson)

Pull request description:

  Credit for the actual patches goes to @theuni, I just tested them on an armv7l machine.

  This change allows the depends system to build our dependencies on 32-bit ARM / armv7l architecture. I.e. with this patch, the following steps now builds fine:
  ```
  $ uname -m
  armv7l
  $ ./autogen.sh
  $ cd depends && make NO_QT=1 && cd ..
  $ ./configure --prefix=$(pwd)/depends/armv7l-unknown-linux-gnueabihf
  $ make
  ```

  Without this patch, the `cd depends && make NO_QT=1` command fails on armv7l.

Tree-SHA512: 1a81be2f1346e0e7080e83a991d9851f0371438262a34580eda5f43ebd220a3ce1ed0d783c43a0a8aed18082bbb1afc91e5c9bf3f4a36eecc82b6a9b6eff5e4c
This commit is contained in:
Wladimir J. van der Laan 2018-02-23 17:11:39 +01:00
commit 28b8061d9f
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
depends/Makefile
View file

@ -21,7 +21,6 @@ BUILD_ID_SALT ?= salt
host:=$(BUILD)
ifneq ($(HOST),)
host:=$(HOST)
host_toolchain:=$(HOST)-
endif
ifneq ($(DEBUG),)

4
depends/hosts/default.mk
View file

@ -1,3 +1,7 @@
ifneq ($(host),$(build))
host_toolchain:=$(host)-
endif
default_host_CC = $(host_toolchain)gcc
default_host_CXX = $(host_toolchain)g++
default_host_AR = $(host_toolchain)ar

1
depends/packages/openssl.mk
View file

@ -47,6 +47,7 @@ $(package)_config_opts_linux=-fPIC -Wa,--noexecstack
$(package)_config_opts_x86_64_linux=linux-x86_64
$(package)_config_opts_i686_linux=linux-generic32
$(package)_config_opts_arm_linux=linux-generic32
$(package)_config_opts_armv7l_linux=linux-generic32
$(package)_config_opts_aarch64_linux=linux-generic64
$(package)_config_opts_mipsel_linux=linux-generic32
$(package)_config_opts_mips_linux=linux-generic32