[vlc-commits] extras/tools: remove openssl
Rafaël Carré
git at videolan.org
Tue Apr 8 10:14:09 CEST 2014
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Apr 8 10:13:40 2014 +0200| [fbfd51491a1e52d7e3c1a83434e27b401e5fcead] | committer: Rafaël Carré
extras/tools: remove openssl
it is never enabled
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fbfd51491a1e52d7e3c1a83434e27b401e5fcead
---
extras/tools/packages.mak | 3 ---
extras/tools/tools.mak | 18 ------------------
2 files changed, 21 deletions(-)
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 93c06d8..75336d5 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -29,9 +29,6 @@ TAR_URL=$(GNU)/tar/tar-$(TAR_VERSION).tar.bz2
XZ_VERSION=5.0.3
XZ_URL=http://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2
-OPENSSL_VERSION=1.0.0e
-OPENSSL_URL=http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
-
GAS_VERSION=eca4c18
GAS_URL=http://git.libav.org/?p=gas-preprocessor.git;a=snapshot;h=$(GAS_VERSION);sf=tgz
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 3c20446..293a312 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -197,24 +197,6 @@ CLEAN_FILE += .pkg-config
CLEAN_PKG += pkgconfig
DISTCLEAN_PKG += pkg-config-$(PKGCFG_VERSION).tar.gz
-# openssl
-# we need to use -j1 here, since otherwise compilation fails (at least on Darwin)
-
-openssl-$(OPENSSL_VERSION).tar.gz:
- $(call download,$(OPENSSL_URL))
-
-openssl: openssl-$(OPENSSL_VERSION).tar.gz
- $(UNPACK)
- $(MOVE)
-
-.openssl: openssl
- (cd openssl; ./config --prefix=$(PREFIX) no-shared no-zlib && $(MAKE) -j1 && $(MAKE) test && $(MAKE) install)
- touch $@
-
-CLEAN_FILE += .openssl
-CLEAN_PKG += openssl
-DISTCLEAN_PKG += openssl-$(OPENSSL_VERSION).tar.gz
-
# gas-preprocessor
gas-preprocessor-$(GAS_VERSION).tar.gz:
$(call download,$(GAS_URL))
More information about the vlc-commits
mailing list