Browse Source

Upgrade OpenSSL & Ruby

master
aeris 2 years ago
parent
commit
586d6585fc
1 changed files with 9 additions and 6 deletions
  1. 9
    6
      Makefile

+ 9
- 6
Makefile View File

@@ -1,12 +1,15 @@
1 1
 PWD = $(shell pwd)
2 2
 export CPATH = $(PWD)/openssl/include
3 3
 export LIBRARY_PATH = $(PWD)/openssl
4
+OPENSSL_LIB_VERSION = 1.0.0
4 5
 OPENSSL_VERSION = 1.0.2g
6
+#OPENSSL_LIB_VERSION = 1.1
7
+#OPENSSL_VERSION = 1.1.0-pre5
5 8
 OPENSSL_NAME = openssl-$(OPENSSL_VERSION)
6 9
 OPENSSL_DIR = build/$(OPENSSL_NAME)
7 10
 #OPENSSL_DIR = openssl
8 11
 RUBY_MAJOR_VERSION = 2.3
9
-RUBY_VERSION = $(RUBY_MAJOR_VERSION).0
12
+RUBY_VERSION = $(RUBY_MAJOR_VERSION).1
10 13
 RUBY_NAME = ruby-$(RUBY_VERSION)
11 14
 RUBY_DIR = build/$(RUBY_NAME)
12 15
 RUBY_OPENSSL_EXT_DIR = $(RUBY_DIR)/ext/openssl
@@ -45,17 +48,17 @@ $(OPENSSL_DIR)/: build/$(OPENSSL_NAME).tar.gz build/chacha-poly.patch
45 48
 	patch -d $(OPENSSL_DIR) -p1 < build/chacha-poly.patch
46 49
 
47 50
 $(OPENSSL_DIR)/Makefile: | $(OPENSSL_DIR)/
48
-	cd $(OPENSSL_DIR) && ./Configure enable-weak-ssl-ciphers enable-ssl3 enable-ssl2 enable-shared linux-x86_64
51
+	cd $(OPENSSL_DIR) && ./Configure enable-ssl2 enable-ssl3 enable-weak-ssl-ciphers enable-shared linux-x86_64
49 52
 
50 53
 $(OPENSSL_DIR)/libssl.so \
51 54
 $(OPENSSL_DIR)/libcrypto.so: $(OPENSSL_DIR)/Makefile
52
-	$(MAKE) -C $(OPENSSL_DIR) depend build_libs
55
+	$(MAKE) -C $(OPENSSL_DIR)
53 56
 
54 57
 lib/%.so: $(OPENSSL_DIR)/%.so
55 58
 	cp $< $@
56
-lib/%.so.1.0.0:
57
-	ln -fs $(notdir $(subst .1.0.0,, $@)) $@
58
-libs: lib/libssl.so lib/libcrypto.so lib/libssl.so.1.0.0 lib/libcrypto.so.1.0.0
59
+lib/%.so.$(OPENSSL_LIB_VERSION): lib/%.so
60
+	ln -fs $(notdir $(subst .$(OPENSSL_LIB_VERSION),,$@)) $@
61
+libs: lib/libssl.so lib/libcrypto.so lib/libssl.so.$(OPENSSL_LIB_VERSION) lib/libcrypto.so.$(OPENSSL_LIB_VERSION)
59 62
 
60 63
 build/$(RUBY_NAME).tar.gz: | build/
61 64
 	wget http://cache.ruby-lang.org/pub/ruby/$(RUBY_MAJOR_VERSION)/$(RUBY_NAME).tar.gz -O $@

Loading…
Cancel
Save