Skip to content

Commit 6820a4d

Browse files
committed
Fix GH-18579: --libdir option default value
Using PHP_LIBDIR for lib64 case
1 parent 3a14ce1 commit 6820a4d

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

UPGRADING.INTERNALS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ PHP 8.5 INTERNALS UPGRADE NOTES
4646
without duplicate build rules. It is up to the SAPI maintainers to ensure
4747
that appropriate build rules are created.
4848

49+
- Linux build system changes
50+
. libdir is properly set when --libdir (ex: /usr/lib64) and --with-libdir (ex lib64)
51+
configure options are used to ${libdir}/php (ex: /usr/lib64/php)
52+
4953
========================
5054
3. Module changes
5155
========================

configure.ac

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,11 +1324,15 @@ AS_VAR_IF([program_prefix], [NONE], [program_prefix=])
13241324
AS_VAR_IF([program_suffix], [NONE], [program_suffix=])
13251325

13261326
orig_libdir=$libdir
1327+
1328+
dnl First for unexpanded (default), second for expanded (from options)
13271329
AS_CASE([$libdir],
1328-
['${exec_prefix}/lib'], [libdir=$libdir/php])
1330+
['${exec_prefix}/lib'], [libdir=$libdir/php],
1331+
[${exec_prefix}/${PHP_LIBDIR}], [libdir=$libdir/php])
13291332

13301333
AS_CASE([$(eval echo $datadir)],
1331-
['${prefix}/share'], [datadir=$datadir/php])
1334+
['${prefix}/share'], [datadir=$datadir/php],
1335+
[${prefix}/share], [datadir=$datadir/php])
13321336

13331337
phptempdir=$(pwd)/libs
13341338

0 commit comments

Comments
 (0)