diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-10-20 09:18:21 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-20 09:18:21 +0000 |
| commit | 82c182f828b3741c494d9014cedb9d0edd9af94e (patch) | |
| tree | cf508e948c37a99e88252b07bc60c83cb7dd633b /package/libs | |
| parent | d225f614bd1e3fd995641f20134cc419ac793307 (diff) | |
| download | upstream-82c182f828b3741c494d9014cedb9d0edd9af94e.tar.gz upstream-82c182f828b3741c494d9014cedb9d0edd9af94e.tar.bz2 upstream-82c182f828b3741c494d9014cedb9d0edd9af94e.zip | |
Revert "openssl: add host build."
This reverts commit r42988
SVN-Revision: 42997
Diffstat (limited to 'package/libs')
| -rw-r--r-- | package/libs/openssl/Makefile | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 23fc555c43..8ffd7f5fed 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -27,8 +27,6 @@ PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE_CRYPTO CONFIG_OPENSSL_ENGINE_DIGEST \ CONFIG_OPENSSL_WITH_EC CONFIG_OPENSSL_WITH_EC2M include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host.mk -include $(INCLUDE_DIR)/host-build.mk define Package/openssl/Default TITLE:=Open source SSL toolkit @@ -200,59 +198,5 @@ define Package/openssl-util/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/ endef - -HOST_CPPFLAGS += $(HOST_FPIC) - -ifeq ($(HOST_ARCH),x86_64) - OPENSSL_HOST_TARGET:=linux-x86_64 -else - OPENSSL_HOST_TARGET:=linux-generic32 -endif - -define Host/Configure - [ -f $(HOST_STAMP_CONFIGURED) ] || { \ - rm -f $(HOST_BUILD_DIR)/*.so.* $(HOST_BUILD_DIR)/*.a; \ - find $(HOST_BUILD_DIR) -name \*.o | xargs rm -f; \ - } - (cd $(HOST_BUILD_DIR); \ - ./Configure "$(OPENSSL_HOST_TARGET)" \ - --prefix=/usr \ - --openssldir=/etc/ssl \ - $(HOST_CPPFLAGS) \ - $(HOST_LDFLAGS) -ldl \ - $(OPENSSL_NO_CIPHERS) \ - shared zlib-dynamic \ - ) - # XXX: OpenSSL "make depend" will look for installed headers before its own, - # so remove installed stuff first - -$(SUBMAKE) -j1 clean-staging - +$(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR) \ - MAKEDEPPROG="$(HOSTCC)" \ - depend -endef - -define Host/Compile - +$(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR) \ - CC="$(HOSTCC)" \ - all - +$(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR) \ - CC="$(HOSTCC)" \ - build-shared - # Work around openssl build bug to link libssl.so with libcrypto.so. - -rm $(HOST_BUILD_DIR)/libssl.so.*.*.* - +$(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR) \ - CC="$(HOSTCC)" \ - do_linux-shared -endef - -define Host/Install - $(MAKE) -C $(HOST_BUILD_DIR) \ - CC="$(HOSTCC)" \ - INSTALL_PREFIX="$(STAGING_DIR_HOST)" \ - install -endef - - $(eval $(call BuildPackage,libopenssl)) $(eval $(call BuildPackage,openssl-util)) -$(eval $(call HostBuild)) |