Commit e8f90a8d authored by Kirill Smelkov's avatar Kirill Smelkov

openssl: Convert patches to -p1

We'll soon need to apply/ship external patches for openssl with us, and
external patches and patches in general usually go in -p1 format.

Since patch-options is "global" - i.e. it affects all patches for
slapos.recipe.cmmi, this change is needed for us to keep
downloaded-from-somewhere patches as unmodified as possible.

/cc @kazuhiko
parent 761418ec
No related merge requests found
...@@ -20,9 +20,9 @@ url = https://www.openssl.org/source/openssl-1.0.1m.tar.gz ...@@ -20,9 +20,9 @@ url = https://www.openssl.org/source/openssl-1.0.1m.tar.gz
md5sum = d143d1555d842a069cb7cc34ba745a06 md5sum = d143d1555d842a069cb7cc34ba745a06
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
patches = patches =
${:_profile_base_location_}/openssl-nodoc.patch#b4887a7b4e18402447bc6227d2493b92 ${:_profile_base_location_}/openssl-nodoc.patch#dd1345ae7ed18ccf176bc6b77c516f98
${:_profile_base_location_}/openssl-exlibs.patch#dfb8979460d6d75f2d23d1ea83bbb40a ${:_profile_base_location_}/openssl-exlibs.patch#fba5c873cf974ba80a973be41da3c738
patch-options = -p0 patch-options = -p1
configure-command = ./config configure-command = ./config
configure-options = configure-options =
-I${zlib:location}/include -I${zlib:location}/include
......
--- engines/ccgost/Makefile~ 2010-08-24 23:46:34.000000000 +0200 --- a/engines/ccgost/Makefile~ 2010-08-24 23:46:34.000000000 +0200
+++ engines/ccgost/Makefile 2012-03-14 10:11:46.826419864 +0100 +++ b/engines/ccgost/Makefile 2012-03-14 10:11:46.826419864 +0100
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
AR= ar r AR= ar r
CFLAGS= $(INCLUDES) $(CFLAG) CFLAGS= $(INCLUDES) $(CFLAG)
......
--- Makefile 2012-01-18 14:42:28.000000000 +0100 --- a/Makefile 2012-01-18 14:42:28.000000000 +0100
+++ Makefile 2012-01-24 17:43:40.000000000 +0100 +++ b/Makefile 2012-01-24 17:43:40.000000000 +0100
@@ -494,7 +494,7 @@ @@ -494,7 +494,7 @@
dist_pem_h: dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment