apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bert Huijben" <b...@qqmail.nl>
Subject RE: svn commit: r1668866 - /apr/apr-util/branches/1.5.x/README.cmake
Date Fri, 03 Apr 2015 22:01:40 GMT


> -----Original Message-----
> From: Jeff Trawick [mailto:trawick@gmail.com]
> Sent: vrijdag 3 april 2015 15:49
> To: dev@apr.apache.org
> Subject: Re: svn commit: r1668866 - /apr/apr-
> util/branches/1.5.x/README.cmake
> 
> On 04/02/2015 04:04 PM, Bert Huijben wrote:
> >
> >> -----Original Message-----
> >> From: trawick@apache.org [mailto:trawick@apache.org]
> >> Sent: dinsdag 24 maart 2015 13:47
> >> To: commits@apr.apache.org
> >> Subject: svn commit: r1668866 - /apr/apr-
> util/branches/1.5.x/README.cmake
> >>
> >> Author: trawick
> >> Date: Tue Mar 24 12:47:10 2015
> >> New Revision: 1668866
> >>
> >> URL: http://svn.apache.org/r1668866
> >> Log:
> >> Port r1668865 from trunk:
> >>
> >> Add hint on a version of cmake that works with OpenSSL 1.0.2.
> >>
> >> Modified:
> >>      apr/apr-util/branches/1.5.x/README.cmake
> >>
> >> Modified: apr/apr-util/branches/1.5.x/README.cmake
> >> URL: http://svn.apache.org/viewvc/apr/apr-
> >>
> util/branches/1.5.x/README.cmake?rev=1668866&r1=1668865&r2=1668866&
> >> view=diff
> >>
> ================================================================
> >> ==============
> >> --- apr/apr-util/branches/1.5.x/README.cmake (original)
> >> +++ apr/apr-util/branches/1.5.x/README.cmake Tue Mar 24 12:47:10 2015
> >> @@ -33,6 +33,8 @@ Prerequisites
> >>   The following tools must be in PATH:
> >>
> >>   * cmake, version 2.8 or later
> >> +  (It has been reported that cmake version 3.1.3 is needed if you build
> >> +  APR-Util in conjunction with OpenSSL 1.0.2.)
> > I think you also need this if you are building against recent 1.0.0 and 1.0.1
> versions as these had the same layout changes applied, which broke the
> regexes for parsing opensslv.h.
> >
> > 	Bert
> >
> >
> Thanks for that; I was surprised to hear that someone had an issue with
> 1.0.2 since I had been using a different cmake to build httpd+apr-util +
> 1.0.2 betas successfully.  I guess a certain cmake level broke
> recognition of 1.0.x levels then 3.1.3 fixed it again???

OpenSSL reformatted all sourcefiles on all their actively maintained branches and this changed
the lines in opensslv.h that used to be formatted like
[[
#define OPENSSL_VERSION_NUMBER	0x1000107fL 
#ifdef OPENSSL_FIPS 
#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1g-fips 7 Apr 2014" 
#else 
#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1g 7 Apr 2014" 
#endif 
#define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
]]

To be formatted as
[[
# define OPENSSL_VERSION_NUMBER  0x100010dfL 
# ifdef OPENSSL_FIPS 
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1m-fips 19 Mar 2015" 
# else 
#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1m 19 Mar 2015" 
# endif 
# define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
]]

But many scripts, including CMake's regexes that try to parse these lines without running
an actual compiler don't like the introduced whitespace between # and define.

In CMake this was fixed in the first release after this formatting (probably 3.1.3, but I
didn't verify that). I had to fix a similar problem in Subversion. Luckily we had no released
versions with this problem there.

	Bert


Mime
View raw message