]>
Commit | Line | Data |
---|---|---|
a0297133 MT |
1 | diff -up openssl-1.0.1e/Configure.rpmbuild openssl-1.0.1e/Configure |
2 | --- openssl-1.0.1e/Configure.rpmbuild 2014-08-13 19:19:53.211005598 +0200 | |
3 | +++ openssl-1.0.1e/Configure 2014-08-13 19:29:21.704099285 +0200 | |
4 | @@ -1675,7 +1676,7 @@ while (<IN>) | |
5 | elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) | |
6 | { | |
7 | my $sotmp = $1; | |
8 | - s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; | |
9 | + s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_SONAMEVER) .s$sotmp/; | |
10 | } | |
11 | elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) | |
12 | { | |
13 | diff -up openssl-1.0.1e/Makefile.org.rpmbuild openssl-1.0.1e/Makefile.org | |
14 | --- openssl-1.0.1e/Makefile.org.rpmbuild 2013-02-11 16:26:04.000000000 +0100 | |
15 | +++ openssl-1.0.1e/Makefile.org 2014-08-13 19:19:53.218005759 +0200 | |
16 | @@ -10,6 +10,7 @@ SHLIB_VERSION_HISTORY= | |
17 | SHLIB_MAJOR= | |
18 | SHLIB_MINOR= | |
19 | SHLIB_EXT= | |
20 | +SHLIB_SONAMEVER=10 | |
21 | PLATFORM=dist | |
22 | OPTIONS= | |
23 | CONFIGURE_ARGS= | |
24 | @@ -333,10 +334,9 @@ clean-shared: | |
25 | link-shared: | |
26 | @ set -e; for i in $(SHLIBDIRS); do \ | |
27 | $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \ | |
28 | - LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ | |
29 | + LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \ | |
30 | LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ | |
31 | symlink.$(SHLIB_TARGET); \ | |
32 | - libs="$$libs -l$$i"; \ | |
33 | done | |
34 | ||
35 | build-shared: do_$(SHLIB_TARGET) link-shared | |
36 | @@ -347,7 +347,7 @@ do_$(SHLIB_TARGET): | |
37 | libs="$(LIBKRB5) $$libs"; \ | |
38 | fi; \ | |
39 | $(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \ | |
40 | - LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ | |
41 | + LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \ | |
42 | LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ | |
43 | LIBDEPS="$$libs $(EX_LIBS)" \ | |
44 | link_a.$(SHLIB_TARGET); \ |