diff options
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/bdb.mk | 3 | ||||
| -rw-r--r-- | depends/packages/boost.mk | 3 | ||||
| -rw-r--r-- | depends/packages/freetype.mk | 2 | ||||
| -rw-r--r-- | depends/packages/libX11.mk | 2 | ||||
| -rw-r--r-- | depends/packages/libXau.mk | 2 | ||||
| -rw-r--r-- | depends/packages/openssl.mk | 7 | ||||
| -rw-r--r-- | depends/packages/protobuf.mk | 2 | ||||
| -rw-r--r-- | depends/packages/qrencode.mk | 2 | ||||
| -rw-r--r-- | depends/packages/xcb_proto.mk | 2 | ||||
| -rw-r--r-- | depends/packages/xtrans.mk | 2 |
10 files changed, 13 insertions, 14 deletions
diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk index f39925723b..68841afdb8 100644 --- a/depends/packages/bdb.mk +++ b/depends/packages/bdb.mk @@ -8,8 +8,7 @@ $(package)_build_subdir=build_unix define $(package)_set_vars $(package)_config_opts=--disable-shared --enable-cxx --disable-replication $(package)_config_opts_mingw32=--enable-mingw -$(package)_config_opts_x86_64_linux=--with-pic -$(package)_config_opts_arm_linux=--with-pic +$(package)_config_opts_linux=--with-pic endef define $(package)_preprocess_cmds diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 53c4c3c74e..f50828c546 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -22,8 +22,7 @@ $(package)_toolset_darwin=darwin $(package)_archiver_darwin=$($(package)_libtool) $(package)_config_libraries=chrono,filesystem,program_options,system,thread,test $(package)_cxxflags=-fvisibility=hidden -$(package)_cxxflags_x86_64_linux=-fPIC -$(package)_cxxflags_arm_linux=-fPIC +$(package)_cxxflags_linux=-fPIC endef define $(package)_preprocess_cmds diff --git a/depends/packages/freetype.mk b/depends/packages/freetype.mk index b83cbd93ea..f7d6e0f9fc 100644 --- a/depends/packages/freetype.mk +++ b/depends/packages/freetype.mk @@ -6,7 +6,7 @@ $(package)_sha256_hash=c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358 define $(package)_set_vars $(package)_config_opts=--without-zlib --without-png --disable-static - $(package)_config_opts_x86_64_linux=--with-pic + $(package)_config_opts_linux=--with-pic endef define $(package)_config_cmds diff --git a/depends/packages/libX11.mk b/depends/packages/libX11.mk index 144021e34b..178d592ee6 100644 --- a/depends/packages/libX11.mk +++ b/depends/packages/libX11.mk @@ -7,7 +7,7 @@ $(package)_dependencies=libxcb xtrans xextproto xproto define $(package)_set_vars $(package)_config_opts=--disable-xkb --disable-static -$(package)_config_opts_x86_64_linux=--with-pic +$(package)_config_opts_linux=--with-pic endef define $(package)_config_cmds diff --git a/depends/packages/libXau.mk b/depends/packages/libXau.mk index 8c9b21846b..e87df2e4de 100644 --- a/depends/packages/libXau.mk +++ b/depends/packages/libXau.mk @@ -7,7 +7,7 @@ $(package)_dependencies=xproto define $(package)_set_vars $(package)_config_opts=--disable-shared - $(package)_config_opts_x86_64_linux=--with-pic + $(package)_config_opts_linux=--with-pic endef define $(package)_config_cmds diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk index 70b0b8d39f..6d7a556c11 100644 --- a/depends/packages/openssl.mk +++ b/depends/packages/openssl.mk @@ -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-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_x86_64_linux=-fPIC linux-x86_64 -$(package)_config_opts_arm_linux=-fPIC linux-generic32 +$(package)_config_opts_linux=-fPIC +$(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_mingw32=mingw64 $(package)_config_opts_i686_mingw32=mingw -$(package)_config_opts_i686_linux=linux-generic32 -fPIC endef define $(package)_preprocess_cmds diff --git a/depends/packages/protobuf.mk b/depends/packages/protobuf.mk index 716f837853..5affad2837 100644 --- a/depends/packages/protobuf.mk +++ b/depends/packages/protobuf.mk @@ -7,7 +7,7 @@ $(package)_dependencies=native_$(package) define $(package)_set_vars $(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 define $(package)_config_cmds diff --git a/depends/packages/qrencode.mk b/depends/packages/qrencode.mk index 69d2982cbc..1ad329e94d 100644 --- a/depends/packages/qrencode.mk +++ b/depends/packages/qrencode.mk @@ -6,7 +6,7 @@ $(package)_sha256_hash=dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b5 define $(package)_set_vars $(package)_config_opts=--disable-shared -without-tools --disable-sdltest -$(package)_config_opts_x86_64_linux=--with-pic +$(package)_config_opts_linux=--with-pic endef define $(package)_config_cmds diff --git a/depends/packages/xcb_proto.mk b/depends/packages/xcb_proto.mk index 726e3048c3..0c7c958d62 100644 --- a/depends/packages/xcb_proto.mk +++ b/depends/packages/xcb_proto.mk @@ -6,7 +6,7 @@ $(package)_sha256_hash=7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c92280 define $(package)_set_vars $(package)_config_opts=--disable-shared - $(package)_config_opts_x86_64_linux=--with-pic + $(package)_config_opts_linux=--with-pic endef define $(package)_config_cmds diff --git a/depends/packages/xtrans.mk b/depends/packages/xtrans.mk index b973149797..99eefa6d5e 100644 --- a/depends/packages/xtrans.mk +++ b/depends/packages/xtrans.mk @@ -6,7 +6,7 @@ $(package)_sha256_hash=054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc335 $(package)_dependencies= define $(package)_set_vars -$(package)_config_opts_x86_64_linux=--with-pic --disable-static +$(package)_config_opts_linux=--with-pic --disable-static endef define $(package)_config_cmds |