[packages/openssl.git] / openssl-no-win32.patch

--- openssl-1.1.1d/Configurations/unix-Makefile.tmpl.orig	2019-09-27 15:57:40.580222104 +0200
+++ openssl-1.1.1d/Configurations/unix-Makefile.tmpl	2019-09-27 16:03:43.774921176 +0200
@@ -201,77 +201,6 @@
    "" -}
 # Do not edit these manually. Use Configure with --prefix or --openssldir
 # to change this!  Short explanation in the top comment in Configure
-INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet
-                  #
-                  use File::Spec::Win32;
-                  my $prefix_default = "$mingw_installroot/OpenSSL";
-                  our $prefix =
-                      File::Spec::Win32->canonpath($config{prefix}
-                                                  || $prefix_default);
-                  our ($prefix_dev, $prefix_dir, $prefix_file) =
-                      File::Spec::Win32->splitpath($prefix, 1);
-                  $prefix =~ s|\\|/|g;
-                  $prefix_dir =~ s|\\|/|g;
-                  $prefix_dev -}
-INSTALLTOP_dir={- my $x = File::Spec::Win32->canonpath($prefix_dir);
-                  $x =~ s|\\|/|g;
-                  $x -}
-OPENSSLDIR_dev={- #
-                  # The logic here is that if no --openssldir was given,
-                  # OPENSSLDIR will get the value "$mingw_commonroot/SSL".
-                  # If --openssldir was given and the value is an absolute
-                  # path, OPENSSLDIR will get its value without change.
-                  # If the value from --openssldir is a relative path,
-                  # OPENSSLDIR will get $prefix with the --openssldir
-                  # value appended as a subdirectory.
-                  #
-                  use File::Spec::Win32;
-                  our $openssldir =
-                      $config{openssldir} ?
-                          (File::Spec::Win32->file_name_is_absolute($config{openssldir}) ?
-                               File::Spec::Win32->canonpath($config{openssldir})
-                               : File::Spec::Win32->catdir($prefix, $config{openssldir}))
-                          : File::Spec::Win32->canonpath("$mingw_commonroot/SSL");
-                  our ($openssldir_dev, $openssldir_dir, $openssldir_file) =
-                      File::Spec::Win32->splitpath($openssldir, 1);
-                  $openssldir =~ s|\\|/|g;
-                  $openssldir_dir =~ s|\\|/|g;
-                  $openssldir_dev -}
-OPENSSLDIR_dir={- my $x = File::Spec::Win32->canonpath($openssldir_dir);
-                  $x =~ s|\\|/|g;
-                  $x -}
-LIBDIR={- our $libdir = $config{libdir} || "lib";
-          File::Spec::Win32->file_name_is_absolute($libdir) ? "" : $libdir -}
-ENGINESDIR_dev={- use File::Spec::Win32;
-                  our $enginesdir =
-                      File::Spec::Win32->catdir($prefix,$libdir,
-                                                "engines-$sover_dirname");
-                  our ($enginesdir_dev, $enginesdir_dir, $enginesdir_file) =
-                      File::Spec::Win32->splitpath($enginesdir, 1);
-                  $enginesdir =~ s|\\|/|g;
-                  $enginesdir_dir =~ s|\\|/|g;
-                  $enginesdir_dev -}
-ENGINESDIR_dir={- my $x = File::Spec::Win32->canonpath($enginesdir_dir);
-                  $x =~ s|\\|/|g;
-                  $x -}
-# In a Windows environment, $(DESTDIR) is harder to contatenate with other
-# directory variables, because both may contain devices.  What we do here is
-# to adapt INSTALLTOP, OPENSSLDIR and ENGINESDIR depending on if $(DESTDIR)
-# has a value or not, to ensure that concatenation will always work further
-# down.
-ifneq "$(DESTDIR)" ""
-INSTALLTOP=$(INSTALLTOP_dir)
-OPENSSLDIR=$(OPENSSLDIR_dir)
-ENGINESDIR=$(ENGINESDIR_dir)
-else
-INSTALLTOP=$(INSTALLTOP_dev)$(INSTALLTOP_dir)
-OPENSSLDIR=$(OPENSSLDIR_dev)$(OPENSSLDIR_dir)
-ENGINESDIR=$(ENGINESDIR_dev)$(ENGINESDIR_dir)
-endif
-
-# $(libdir) is chosen to be compatible with the GNU coding standards
-libdir={- File::Spec::Win32->file_name_is_absolute($libdir)
-          ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
 {- output_on() if $config{target} !~ /^mingw/; "" -}
 
 MANDIR=$(INSTALLTOP)/share/man
Commit	Line	Data
f1604096 JB	1	--- openssl-1.1.1d/Configurations/unix-Makefile.tmpl.orig 2019-09-27 15:57:40.580222104 +0200
	2	+++ openssl-1.1.1d/Configurations/unix-Makefile.tmpl 2019-09-27 16:03:43.774921176 +0200
	3	@@ -201,77 +201,6 @@
	4	"" -}
	5	# Do not edit these manually. Use Configure with --prefix or --openssldir
	6	# to change this! Short explanation in the top comment in Configure
	7	-INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet
	8	- #
	9	- use File::Spec::Win32;
	10	- my $prefix_default = "$mingw_installroot/OpenSSL";
	11	- our $prefix =
	12	- File::Spec::Win32->canonpath($config{prefix}
	13	- \|\| $prefix_default);
	14	- our ($prefix_dev, $prefix_dir, $prefix_file) =
	15	- File::Spec::Win32->splitpath($prefix, 1);
	16	- $prefix =~ s\|\\\|/\|g;
	17	- $prefix_dir =~ s\|\\\|/\|g;
	18	- $prefix_dev -}
	19	-INSTALLTOP_dir={- my $x = File::Spec::Win32->canonpath($prefix_dir);
	20	- $x =~ s\|\\\|/\|g;
	21	- $x -}
	22	-OPENSSLDIR_dev={- #
	23	- # The logic here is that if no --openssldir was given,
	24	- # OPENSSLDIR will get the value "$mingw_commonroot/SSL".
	25	- # If --openssldir was given and the value is an absolute
	26	- # path, OPENSSLDIR will get its value without change.
	27	- # If the value from --openssldir is a relative path,
	28	- # OPENSSLDIR will get $prefix with the --openssldir
	29	- # value appended as a subdirectory.
	30	- #
	31	- use File::Spec::Win32;
	32	- our $openssldir =
	33	- $config{openssldir} ?
	34	- (File::Spec::Win32->file_name_is_absolute($config{openssldir}) ?
	35	- File::Spec::Win32->canonpath($config{openssldir})
	36	- : File::Spec::Win32->catdir($prefix, $config{openssldir}))
	37	- : File::Spec::Win32->canonpath("$mingw_commonroot/SSL");
	38	- our ($openssldir_dev, $openssldir_dir, $openssldir_file) =
	39	- File::Spec::Win32->splitpath($openssldir, 1);
	40	- $openssldir =~ s\|\\\|/\|g;
	41	- $openssldir_dir =~ s\|\\\|/\|g;
	42	- $openssldir_dev -}
	43	-OPENSSLDIR_dir={- my $x = File::Spec::Win32->canonpath($openssldir_dir);
	44	- $x =~ s\|\\\|/\|g;
	45	- $x -}
	46	-LIBDIR={- our $libdir = $config{libdir} \|\| "lib";
	47	- File::Spec::Win32->file_name_is_absolute($libdir) ? "" : $libdir -}
	48	-ENGINESDIR_dev={- use File::Spec::Win32;
	49	- our $enginesdir =
	50	- File::Spec::Win32->catdir($prefix,$libdir,
	51	- "engines-$sover_dirname");
	52	- our ($enginesdir_dev, $enginesdir_dir, $enginesdir_file) =
	53	- File::Spec::Win32->splitpath($enginesdir, 1);
	54	- $enginesdir =~ s\|\\\|/\|g;
	55	- $enginesdir_dir =~ s\|\\\|/\|g;
	56	- $enginesdir_dev -}
	57	-ENGINESDIR_dir={- my $x = File::Spec::Win32->canonpath($enginesdir_dir);
	58	- $x =~ s\|\\\|/\|g;
	59	- $x -}
	60	-# In a Windows environment, $(DESTDIR) is harder to contatenate with other
	61	-# directory variables, because both may contain devices. What we do here is
	62	-# to adapt INSTALLTOP, OPENSSLDIR and ENGINESDIR depending on if $(DESTDIR)
	63	-# has a value or not, to ensure that concatenation will always work further
	64	-# down.
65	-ifneq "$(DESTDIR)" ""
66	-INSTALLTOP=$(INSTALLTOP_dir)
67	-OPENSSLDIR=$(OPENSSLDIR_dir)
68	-ENGINESDIR=$(ENGINESDIR_dir)
69	-else
70	-INSTALLTOP=$(INSTALLTOP_dev)$(INSTALLTOP_dir)
71	-OPENSSLDIR=$(OPENSSLDIR_dev)$(OPENSSLDIR_dir)
72	-ENGINESDIR=$(ENGINESDIR_dev)$(ENGINESDIR_dir)
73	-endif
74	-
75	-# $(libdir) is chosen to be compatible with the GNU coding standards
76	-libdir={- File::Spec::Win32->file_name_is_absolute($libdir)
77	- ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
78	{- output_on() if $config{target} !~ /^mingw/; "" -}
79
80	MANDIR=$(INSTALLTOP)/share/man