depends: Use pic for all linux dependencies

This avoids textrels, and matches previous gitian behavior.
This commit is contained in:
Cory Fields 2014-11-11 18:21:23 -05:00
parent b5d1b10929
commit 4302fa67b1
10 changed files with 13 additions and 14 deletions

View File

@ -8,8 +8,7 @@ $(package)_build_subdir=build_unix
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts=--disable-shared --enable-cxx --disable-replication $(package)_config_opts=--disable-shared --enable-cxx --disable-replication
$(package)_config_opts_mingw32=--enable-mingw $(package)_config_opts_mingw32=--enable-mingw
$(package)_config_opts_x86_64_linux=--with-pic $(package)_config_opts_linux=--with-pic
$(package)_config_opts_arm_linux=--with-pic
endef endef
define $(package)_preprocess_cmds define $(package)_preprocess_cmds

View File

@ -22,8 +22,7 @@ $(package)_toolset_darwin=darwin
$(package)_archiver_darwin=$($(package)_libtool) $(package)_archiver_darwin=$($(package)_libtool)
$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test $(package)_config_libraries=chrono,filesystem,program_options,system,thread,test
$(package)_cxxflags=-fvisibility=hidden $(package)_cxxflags=-fvisibility=hidden
$(package)_cxxflags_x86_64_linux=-fPIC $(package)_cxxflags_linux=-fPIC
$(package)_cxxflags_arm_linux=-fPIC
endef endef
define $(package)_preprocess_cmds define $(package)_preprocess_cmds

View File

@ -6,7 +6,7 @@ $(package)_sha256_hash=c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts=--without-zlib --without-png --disable-static $(package)_config_opts=--without-zlib --without-png --disable-static
$(package)_config_opts_x86_64_linux=--with-pic $(package)_config_opts_linux=--with-pic
endef endef
define $(package)_config_cmds define $(package)_config_cmds

View File

@ -7,7 +7,7 @@ $(package)_dependencies=libxcb xtrans xextproto xproto
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts=--disable-xkb --disable-static $(package)_config_opts=--disable-xkb --disable-static
$(package)_config_opts_x86_64_linux=--with-pic $(package)_config_opts_linux=--with-pic
endef endef
define $(package)_config_cmds define $(package)_config_cmds

View File

@ -7,7 +7,7 @@ $(package)_dependencies=xproto
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts=--disable-shared $(package)_config_opts=--disable-shared
$(package)_config_opts_x86_64_linux=--with-pic $(package)_config_opts_linux=--with-pic
endef endef
define $(package)_config_cmds define $(package)_config_cmds

View File

@ -10,12 +10,13 @@ $(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/o
$(package)_config_opts+=no-krb5 no-camellia no-capieng no-cast no-cms no-dtls1 no-gost no-gmp no-heartbeats no-idea no-jpake no-md2 $(package)_config_opts+=no-krb5 no-camellia no-capieng no-cast no-cms no-dtls1 no-gost no-gmp no-heartbeats no-idea no-jpake no-md2
$(package)_config_opts+=no-mdc2 no-rc5 no-rdrand no-rfc3779 no-rsax no-sctp no-seed no-sha0 no-static_engine no-whirlpool no-rc2 no-rc4 no-ssl2 no-ssl3 $(package)_config_opts+=no-mdc2 no-rc5 no-rdrand no-rfc3779 no-rsax no-sctp no-seed no-sha0 no-static_engine no-whirlpool no-rc2 no-rc4 no-ssl2 no-ssl3
$(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags) $(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags)
$(package)_config_opts_x86_64_linux=-fPIC linux-x86_64 $(package)_config_opts_linux=-fPIC
$(package)_config_opts_arm_linux=-fPIC linux-generic32 $(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_x86_64_darwin=darwin64-x86_64-cc $(package)_config_opts_x86_64_darwin=darwin64-x86_64-cc
$(package)_config_opts_x86_64_mingw32=mingw64 $(package)_config_opts_x86_64_mingw32=mingw64
$(package)_config_opts_i686_mingw32=mingw $(package)_config_opts_i686_mingw32=mingw
$(package)_config_opts_i686_linux=linux-generic32 -fPIC
endef endef
define $(package)_preprocess_cmds define $(package)_preprocess_cmds

View File

@ -7,7 +7,7 @@ $(package)_dependencies=native_$(package)
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts=--disable-shared --with-protoc=$(build_prefix)/bin/protoc $(package)_config_opts=--disable-shared --with-protoc=$(build_prefix)/bin/protoc
$(package)_config_opts_x86_64_linux=--with-pic $(package)_config_opts_linux=--with-pic
endef endef
define $(package)_config_cmds define $(package)_config_cmds

View File

@ -6,7 +6,7 @@ $(package)_sha256_hash=dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b5
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts=--disable-shared -without-tools --disable-sdltest $(package)_config_opts=--disable-shared -without-tools --disable-sdltest
$(package)_config_opts_x86_64_linux=--with-pic $(package)_config_opts_linux=--with-pic
endef endef
define $(package)_config_cmds define $(package)_config_cmds

View File

@ -6,7 +6,7 @@ $(package)_sha256_hash=7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c92280
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts=--disable-shared $(package)_config_opts=--disable-shared
$(package)_config_opts_x86_64_linux=--with-pic $(package)_config_opts_linux=--with-pic
endef endef
define $(package)_config_cmds define $(package)_config_cmds

View File

@ -6,7 +6,7 @@ $(package)_sha256_hash=054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc335
$(package)_dependencies= $(package)_dependencies=
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts_x86_64_linux=--with-pic --disable-static $(package)_config_opts_linux=--with-pic --disable-static
endef endef
define $(package)_config_cmds define $(package)_config_cmds