{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752657102, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"803e02d7590fddc08a9c78d27261857a", "commit": {"type":"commit", "time": 1522615158, "time_ofs": 120, "oid_tree": { "oid": "9da280a3417248800bb1065604a26f137dc94ad3", "alias": []}, "oid":{ "oid": "2cc8fe11add1b21f3f30cbcf365bb8d8da4fd2b4", "alias": []}, "msg": "Windows builds: remove over-quotation of LIBZ macro", "sig_commit": { "git_time": { "time": 1522615158, "offset": 120 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }, "sig_author": { "git_time": { "time": 1522597276, "offset": 120 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }}, "body": "Windows builds: remove over-quotation of LIBZ macro\n\nThe LIBZ macro definition was already quoted in BASE_windows, then got\nquotified once more in windows-makefile.tmpl. That's a bit too much\nquotations, ending up with the compiler being asked to define the\nmacro |\u0022LIBZ\u003d\u005c\u0022ZLIB1\u005c\u0022\u0022| (no, not the macro LIBZ with the value\n\u0022ZLIB1\u0022). This is solved by removing the extra quoting in\nBASE_windows.\n\nAlong with this, change the quotation of macro definitions and include\nfile specification, so we end up with things like -I\u0022QuotedPath\u0022 and\n-D\u0022Macro\u003d\u005c\u0022some weird value\u005c\u0022\u0022 rather than \u0022-IQuotedPath\u0022 and\n\u0022-DMacro\u003d\u005c\u0022some weird value\u005c\u0022\u0022.\n\nFixes #5827\n\nReviewed-by: Andy Polyakov \u003cappro@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/5833)\n" , "diff": "diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf\nindex c074bd6..edcc454 100644\n--- a/Configurations/00-base-templates.conf\n+++ b/Configurations/00-base-templates.conf\n@@ -114,7 +114,7 @@ my %targets\u003d(\n my @defs \u003d ();\n unless ($disabled{\u0022zlib-dynamic\u0022}) {\n my $zlib \u003d $withargs{zlib_lib} // \u0022ZLIB1\u0022;\n- push @defs, quotify(\u0022perl\u0022, 'LIBZ\u003d\u0022' . $zlib . '\u0022');\n+ push @defs, 'LIBZ\u003d' . (quotify(\u0022perl\u0022, $zlib))[0];\n }\n return [ @defs ];\n },\ndiff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl\nindex 49da786..e9179a4 100644\n--- a/Configurations/windows-makefile.tmpl\n+++ b/Configurations/windows-makefile.tmpl\n@@ -207,10 +207,10 @@ CNF_ASFLAGS\u003d{- join(' ', $target{asflags} || (),\n @{$config{asflags}}) -}\n CNF_CPPFLAGS\u003d{- our $cppfags2 \u003d\n join(' ', $target{cppflags} || (),\n- (map { quotify_l(\u0022-D\u0022.$_) } @{$target{defines}},\n- @{$config{defines}}),\n- (map { quotify_l(\u0022-I\u0022.$_) } @{$target{includes}},\n- @{$config{includes}}),\n+ (map { '-D'.quotify1($_) } @{$target{defines}},\n+ @{$config{defines}}),\n+ (map { '-I'.quotify1($_) } @{$target{includes}},\n+ @{$config{includes}}),\n @{$config{cppflags}}) -}\n CNF_CFLAGS\u003d{- join(' ', $target{cflags} || (),\n @{$config{cflags}}) -}\n@@ -233,12 +233,12 @@ LIB_ASFLAGS\u003d{- join(' ', $target{lib_asflags} || (),\n LIB_CPPFLAGS\u003d{- our $lib_cppflags \u003d\n join(' ', $target{lib_cppflags} || (),\n $target{shared_cppflag} || (),\n- (map { quotify_l(\u0022-D\u0022.$_) }\n+ (map { '-D'.quotify1($_) }\n @{$target{lib_defines}},\n @{$target{shared_defines}},\n @{$config{lib_defines}},\n @{$config{shared_defines}}),\n- (map { quotify_l(\u0022-I\u0022.$_) }\n+ (map { '-I'.quotify1($_) }\n @{$target{lib_includes}},\n @{$target{shared_includes}},\n @{$config{lib_includes}},\n@@ -246,7 +246,7 @@ LIB_CPPFLAGS\u003d{- our $lib_cppflags \u003d\n @{$config{lib_cppflags}},\n @{$config{shared_cppflag}});\n join(' ', $lib_cppflags,\n- (map { quotify_l(\u0022-D\u0022.$_) }\n+ (map { '-D'.quotify1($_) }\n \u0022OPENSSLDIR\u003d\u005c\u0022$openssldir\u005c\u0022\u0022,\n \u0022ENGINESDIR\u003d\u005c\u0022$enginesdir\u005c\u0022\u0022),\n '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}\n","s":{"c":1752657102,"u": 36537}} ],"g": 37728,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}