Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Jan 2015 00:12:21 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org
Subject:   svn commit: r276862 - in vendor-crypto/openssl/dist: crypto util
Message-ID:  <201501090012.t090CLMT091682@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Fri Jan  9 00:12:20 2015
New Revision: 276862
URL: https://svnweb.freebsd.org/changeset/base/276862

Log:
  Fix build failure on Windows due to undefined cflags identifier.
  
  https://github.com/openssl/openssl/commit/5c5e7e1a7eb114cf136e1ae4b6a413bc48ba41eb

Modified:
  vendor-crypto/openssl/dist/crypto/cversion.c
  vendor-crypto/openssl/dist/util/mkbuildinf.pl

Modified: vendor-crypto/openssl/dist/crypto/cversion.c
==============================================================================
--- vendor-crypto/openssl/dist/crypto/cversion.c	Thu Jan  8 23:42:41 2015	(r276861)
+++ vendor-crypto/openssl/dist/crypto/cversion.c	Fri Jan  9 00:12:20 2015	(r276862)
@@ -77,7 +77,7 @@ const char *SSLeay_version(int t)
 	if (t == SSLEAY_CFLAGS)
 		{
 #ifdef CFLAGS
-		return(cflags);
+		return(CFLAGS);
 #else
 		return("compiler: information not available");
 #endif

Modified: vendor-crypto/openssl/dist/util/mkbuildinf.pl
==============================================================================
--- vendor-crypto/openssl/dist/util/mkbuildinf.pl	Thu Jan  8 23:42:41 2015	(r276861)
+++ vendor-crypto/openssl/dist/util/mkbuildinf.pl	Fri Jan  9 00:12:20 2015	(r276862)
@@ -7,7 +7,7 @@ $date = localtime();
 print <<"END_OUTPUT";
 #ifndef MK1MF_BUILD
     /* auto-generated by util/mkbuildinf.pl for crypto/cversion.c */
-    #define CFLAGS
+    #define CFLAGS cflags
     /*
      * Generate CFLAGS as an array of individual characters. This is a
      * workaround for the situation where CFLAGS gets too long for a C90 string



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501090012.t090CLMT091682>