[vlc-devel] [PATCH] tools: fix cmake 3.2.3 building

[Steve Lhomme]

On Mon, Feb 8, 2016 at 5:48 PM, Sean McGovern <gseanmcg at gmail.com> wrote:
> Hi Steve,
>
> On Feb 8, 2016 10:48, "Steve Lhomme" <robux4 at videolabs.io> wrote:
>>
>> From: Steve Lhomme <robux4 at gmail.com>
>>
>> otherwise mode_t may not be defined
>> ---
>>  extras/tools/cmake-3.2.3.patch | 10 ++++++++++
>>  extras/tools/tools.mak         |  3 ++-
>>  2 files changed, 12 insertions(+), 1 deletion(-)
>>  create mode 100644 extras/tools/cmake-3.2.3.patch
>>
>> diff --git a/extras/tools/cmake-3.2.3.patch
>> b/extras/tools/cmake-3.2.3.patch
>> new file mode 100644
>> index 0000000..b697cc2
>> --- /dev/null
>> +++ b/extras/tools/cmake-3.2.3.patch
>> @@ -0,0 +1,10 @@
>> +--- cmake/Source/cmGeneratorExpressionEvaluationFile.h.orig    2016-02-04
>> 11:47:52.735890500 +0100
>> ++++ cmake/Source/cmGeneratorExpressionEvaluationFile.h 2016-02-04
>> 11:46:06.493912300 +0100
>> +@@ -14,6 +14,7 @@
>> +
>> + #include "cmStandardIncludes.h"
>> + #include <cmsys/auto_ptr.hxx>
>
> It is usually a good idea to surround this with #if HAVE_SYS_TYPES_H,
> however I'm not sure if cmake's configury tests for that.

I'll give it a try. But since cmake builds cmake using cmake, I'm not
sure it's even considered. Also the file is included many times
elsewhere without this guard.

>> ++#include <sys/types.h>
>> +
>> + #include "cmGeneratorExpression.h"
>> +
>> diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
>> index 69a8d2d..c782ed7 100644
>> --- a/extras/tools/tools.mak
>> +++ b/extras/tools/tools.mak
>> @@ -65,10 +65,11 @@ cmake-$(CMAKE_VERSION).tar.gz:
>>
>>  cmake: cmake-$(CMAKE_VERSION).tar.gz
>>         $(UNPACK)
>> +       $(APPLY) cmake-3.2.3.patch
>>         $(MOVE)
>>
>>  .cmake: cmake
>> -       (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE)
>> install)
>> +       (cd $<; ./configure --prefix=$(PREFIX) --parallel=`nproc` &&
>> $(MAKE) && $(MAKE) install)
>>         touch $@
>>
>>
>
> Please lets not use nproc. Or at least can we probe for it first?

Oops, I messed up. I'll submit a fixed patch.

> -- Sean McG.
>
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>