Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit57bab33

Browse files
committed
meson: catch up to a few configure changes
I (Andres) missed a few recent changes to configure when merginge692727 "meson: Add initial version of meson based build system". Mirrorthe changes in-ec3c9cc "Add definition pg_attribute_aligned() for MSVC"-b086a47 "Bump minimum version of Bison to 2.3"-8b878bf "Bump minimum version of Flex to 2.5.35"As MSVC does not implement 128 bit integers, the oversight of not usingpg_attribute_aligned() should not have current practical consequences. But ofcourse the code from c.h should still be correctly mirrored.I (Andres) also hadn't implemented the minimum perl version check. Added thatnow.Reported-by: Junwang Zhao <zhjwpku@gmail.com>Author: Junwang Zhao <zhjwpku@gmail.com>Author: Andres Freund <andres@anarazel.de>Discussion:https://postgr.es/m/CAEG8a3K9c87EwAwmdOgmS0Li1J6P_7r-Uc0-zN6cJtrMr7VvPg@mail.gmail.com
1 parentcba4e78 commit57bab33

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

‎meson.build

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ endif
316316
# External programs
317317
perl=find_program(get_option('PERL'),required:true,native:true)
318318
python=find_program(get_option('PYTHON'),required:true,native:true)
319-
flex=find_program(get_option('FLEX'),native:true,version:'>= 2.5.31')
320-
bison=find_program(get_option('BISON'),native:true,version:'>=1.875')
319+
flex=find_program(get_option('FLEX'),native:true,version:'>= 2.5.35')
320+
bison=find_program(get_option('BISON'),native:true,version:'>=2.3')
321321
sed=find_program(get_option('SED'),'sed',native:true)
322322
prove=find_program(get_option('PROVE'),native:true)
323323
tar=find_program(get_option('TAR'),native:true)
@@ -864,7 +864,10 @@ if not perlopt.disabled()
864864

865865
perl_inc_dir='@0@/CORE'.format(archlibexp)
866866

867-
if useshrplib!='true'
867+
if perlversion.version_compare('< 5.14')
868+
perl_may_work=false
869+
perl_msg='Perl version 5.14 or later is required, but this is @0@'.format(perlversion)
870+
elif useshrplib!='true'
868871
perl_may_work=false
869872
perl_msg='need a shared perl'
870873
endif
@@ -1458,6 +1461,8 @@ if cc.links('''
14581461
/* This must match the corresponding code in c.h: */
14591462
#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__IBMC__)
14601463
#define pg_attribute_aligned(a) __attribute__((aligned(a)))
1464+
#elif defined(_MSC_VER)
1465+
#define pg_attribute_aligned(a) __declspec(align(a))
14611466
#endif
14621467
typedef __int128 int128a
14631468
#if defined(pg_attribute_aligned)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp