commit a80a53627de00e1c24b9fa7b15392abaaf195355 parent ebfd186e4ee77fa94b1d8bb094e697537c34963d Author: Daniel Bainton <dpb@driftaway.org> Date: Mon, 26 May 2014 13:50:05 +0300 Use mkbuild's patch support Diffstat:
| M | openssl/mkfile | | | 7 | +++++++ |
| M | openssl/openssl.mk | | | 13 | ------------- |
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/openssl/mkfile b/openssl/mkfile @@ -4,3 +4,10 @@ src = openssl-$v url = https://www.openssl.org/source/openssl-$v.tar.gz mkfile = ../openssl.mk +patches = \ + ../openssl-1.0.0a-ldflags.patch \ + ../openssl-1.0.0d-windres.patch \ + ../openssl-1.0.0h-pkg-config.patch \ + ../openssl-1.0.1-parallel-build.patch \ + ../openssl-1.0.1-x32.patch \ + 0 ../openssl-1.0.1e-ipv6.patch diff --git a/openssl/openssl.mk b/openssl/openssl.mk @@ -5,19 +5,6 @@ DEPS = zlib <$mkbuild/mk.common-noinst openssl:QV: - # apply patches - patch --silent --dry-run -N -p1 < ../openssl-1.0.0a-ldflags.patch && \ - patch -p1 < ../openssl-1.0.0a-ldflags.patch #327421 - patch --silent --dry-run -N -p1 < ../openssl-1.0.0d-windres.patch && \ - patch -p1 < ../openssl-1.0.0d-windres.patch #373743 - patch --silent --dry-run -N -p1 < ../openssl-1.0.0h-pkg-config.patch && \ - patch -p1 < ../openssl-1.0.0h-pkg-config.patch - patch --silent --dry-run -N -p1 < ../openssl-1.0.1-parallel-build.patch && \ - patch -p1 < ../openssl-1.0.1-parallel-build.patch - patch --silent --dry-run -N -p1 < ../openssl-1.0.1-x32.patch && \ - patch -p1 < ../openssl-1.0.1-x32.patch - patch --silent --dry-run -N -p0 < ../openssl-1.0.1e-ipv6.patch && \ - patch -p0 < ../openssl-1.0.1e-ipv6.patch # disable fips in the build # make sure the man pages are suffixed #302165 # don't bother building man pages if they're disabled