Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 195765 | Differences between
and this patch

Collapse All | Expand All

(-)eclass/php5_2-sapi.eclass (-40 / +46 lines)
Lines 233-242 Link Here
233
}
233
}
234
234
235
php5_2-sapi_install_ini() {
235
php5_2-sapi_install_ini() {
236
	destdir=/usr/$(get_libdir)/php5
236
	destdir="$EPREFIX"/usr/$(get_libdir)/php5
237
237
238
	# get the extension dir, if not already defined
238
	# get the extension dir, if not already defined
239
	[[ -z "${PHPEXTDIR}" ]] && PHPEXTDIR="`"${ED}/${destdir}/bin/php-config" --extension-dir`"
239
	[[ -z "${PHPEXTDIR}" ]] && PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`"
240
240
241
	# work out where we are installing the ini file
241
	# work out where we are installing the ini file
242
	php5_2-sapi_set_php_ini_dir
242
	php5_2-sapi_set_php_ini_dir
Lines 389-396 Link Here
389
	# Fix configure scripts to correctly support Suhosin
389
	# Fix configure scripts to correctly support Suhosin
390
	einfo "Running aclocal"
390
	einfo "Running aclocal"
391
	aclocal --force || die "Unable to run aclocal successfully"
391
	aclocal --force || die "Unable to run aclocal successfully"
392
	# Prefixed portage seems not to find libtoolize here, since it is glibtoolize
393
	if use x86-macos; then
394
		LIBTOOLIZE=glibtoolize
395
	else
396
		LIBTOOLIZE=libtoolize
397
	fi
392
	einfo "Running libtoolize"
398
	einfo "Running libtoolize"
393
	libtoolize --copy --force || die "Unable to run libtoolize successfully"
399
	$LIBTOOLIZE --copy --force || die "Unable to run libtoolize successfully"
394
400
395
	# Rebuild configure to make sure it's up to date
401
	# Rebuild configure to make sure it's up to date
396
	einfo "Rebuilding configure script"
402
	einfo "Rebuilding configure script"
Lines 408-414 Link Here
408
# Takes care of compiling php according to USE flags set by user (and those automagically
414
# Takes care of compiling php according to USE flags set by user (and those automagically
409
# enabled via phpconfutils eclass if unavoidable).
415
# enabled via phpconfutils eclass if unavoidable).
410
php5_2-sapi_src_compile() {
416
php5_2-sapi_src_compile() {
411
	destdir=/usr/$(get_libdir)/php5
417
	destdir="$EPREFIX"/usr/$(get_libdir)/php5
412
418
413
	php5_2-sapi_set_php_ini_dir
419
	php5_2-sapi_set_php_ini_dir
414
420
Lines 420-429 Link Here
420
426
421
	#				extension		USE flag		shared support?
427
	#				extension		USE flag		shared support?
422
	phpconfutils_extension_enable	"bcmath"		"bcmath"		1
428
	phpconfutils_extension_enable	"bcmath"		"bcmath"		1
423
	phpconfutils_extension_with	"bz2"			"bzip2"			1
429
	phpconfutils_extension_with	"bz2"			"bzip2"			1 "$EPREFIX/usr"
424
	phpconfutils_extension_enable	"calendar"		"calendar"		1
430
	phpconfutils_extension_enable	"calendar"		"calendar"		1
425
	phpconfutils_extension_disable	"ctype"			"ctype"			0
431
	phpconfutils_extension_disable	"ctype"			"ctype"			0
426
	phpconfutils_extension_with	"curl"			"curl"			1
432
	phpconfutils_extension_with	"curl"			"curl"			1 "$EPREFIX/usr"
427
	phpconfutils_extension_with	"curlwrappers"		"curlwrappers"		0
433
	phpconfutils_extension_with	"curlwrappers"		"curlwrappers"		0
428
	phpconfutils_extension_enable	"dbase"			"dbase"			1
434
	phpconfutils_extension_enable	"dbase"			"dbase"			1
429
	phpconfutils_extension_disable	"dom"			"xml"			0
435
	phpconfutils_extension_disable	"dom"			"xml"			0
Lines 433-464 Link Here
433
	phpconfutils_extension_disable	"filter"		"filter"		0
439
	phpconfutils_extension_disable	"filter"		"filter"		0
434
	phpconfutils_extension_enable	"ftp"			"ftp"			1
440
	phpconfutils_extension_enable	"ftp"			"ftp"			1
435
	phpconfutils_extension_with	"gettext"		"nls"			1
441
	phpconfutils_extension_with	"gettext"		"nls"			1
436
	phpconfutils_extension_with	"gmp"			"gmp"			1
442
	phpconfutils_extension_with	"gmp"			"gmp"			1 "$EPREFIX/usr"
437
	phpconfutils_extension_disable	"hash"			"hash"			0
443
	phpconfutils_extension_disable	"hash"			"hash"			0
438
	phpconfutils_extension_without	"iconv"			"iconv"			0
444
	phpconfutils_extension_without	"iconv"			"iconv"			0
439
	phpconfutils_extension_disable	"ipv6"			"ipv6"			0
445
	phpconfutils_extension_disable	"ipv6"			"ipv6"			0
440
	phpconfutils_extension_disable	"json"			"json"			0
446
	phpconfutils_extension_disable	"json"			"json"			0
441
	phpconfutils_extension_with	"kerberos"		"kerberos"		0 "/usr"
447
	phpconfutils_extension_with	"kerberos"		"kerberos"		0 "$EPREFIX/usr"
442
	phpconfutils_extension_disable	"libxml"		"xml"			0
448
	phpconfutils_extension_disable	"libxml"		"xml"			0
443
	phpconfutils_extension_enable	"mbstring"		"unicode"		1
449
	phpconfutils_extension_enable	"mbstring"		"unicode"		1
444
	phpconfutils_extension_with	"mcrypt"		"crypt"			1
450
	phpconfutils_extension_with	"mcrypt"		"crypt"			1 "$EPREFIX/usr"
445
	phpconfutils_extension_with	"mhash"			"mhash"			1
451
	phpconfutils_extension_with	"mhash"			"mhash"			1
446
	phpconfutils_extension_with	"msql"			"msql"			1
452
	phpconfutils_extension_with	"msql"			"msql"			1
447
	phpconfutils_extension_with	"mssql"			"mssql"			1
453
	phpconfutils_extension_with	"mssql"			"mssql"			1
448
	phpconfutils_extension_with	"ncurses"		"ncurses"		1
454
	phpconfutils_extension_with	"ncurses"		"ncurses"		1 "$EPREFIX/usr"
449
	phpconfutils_extension_with	"openssl"		"ssl"			0
455
	phpconfutils_extension_with	"openssl"		"ssl"			0
450
	phpconfutils_extension_with	"openssl-dir"		"ssl"			0 "/usr"
456
	phpconfutils_extension_with	"openssl-dir"		"ssl"			0 "$EPREFIX/usr"
451
	phpconfutils_extension_enable	"pcntl" 		"pcntl" 		1
457
	phpconfutils_extension_enable	"pcntl" 		"pcntl" 		1
452
	phpconfutils_extension_without	"pcre-regex"		"pcre"			0
458
	phpconfutils_extension_without	"pcre-regex"		"pcre"			0
453
	phpconfutils_extension_disable	"pdo"			"pdo"			0
459
	phpconfutils_extension_disable	"pdo"			"pdo"			0
454
	phpconfutils_extension_with	"pgsql"			"postgres"		1
460
	phpconfutils_extension_with	"pgsql"			"postgres"		1 "$EPREFIX/usr"
455
	phpconfutils_extension_disable	"posix"			"posix"			0
461
	phpconfutils_extension_disable	"posix"			"posix"			0
456
	phpconfutils_extension_with	"pspell"		"spell"			1
462
	phpconfutils_extension_with	"pspell"		"spell"			1 "$EPREFIX/usr"
457
	phpconfutils_extension_with	"recode"		"recode"		1
463
	phpconfutils_extension_with	"recode"		"recode"		1 "$EPREFIX/usr"
458
	phpconfutils_extension_disable	"reflection"		"reflection"		0
464
	phpconfutils_extension_disable	"reflection"		"reflection"		0
459
	phpconfutils_extension_disable	"simplexml"		"simplexml"		0
465
	phpconfutils_extension_disable	"simplexml"		"simplexml"		0
460
	phpconfutils_extension_enable	"shmop"			"sharedmem"		0
466
	phpconfutils_extension_enable	"shmop"			"sharedmem"		0
461
	phpconfutils_extension_with	"snmp"			"snmp"			1
467
	phpconfutils_extension_with	"snmp"			"snmp"			1 "$EPREFIX/usr"
462
	phpconfutils_extension_enable	"soap"			"soap"			1
468
	phpconfutils_extension_enable	"soap"			"soap"			1
463
	phpconfutils_extension_enable	"sockets"		"sockets"		1
469
	phpconfutils_extension_enable	"sockets"		"sockets"		1
464
	phpconfutils_extension_disable	"spl"			"spl"			0
470
	phpconfutils_extension_disable	"spl"			"spl"			0
Lines 467-482 Link Here
467
	phpconfutils_extension_enable	"sysvmsg"		"sysvipc"		1
473
	phpconfutils_extension_enable	"sysvmsg"		"sysvipc"		1
468
	phpconfutils_extension_enable	"sysvsem"		"sysvipc"		1
474
	phpconfutils_extension_enable	"sysvsem"		"sysvipc"		1
469
	phpconfutils_extension_enable	"sysvshm"		"sysvipc"		1
475
	phpconfutils_extension_enable	"sysvshm"		"sysvipc"		1
470
	phpconfutils_extension_with	"tidy"			"tidy"			1
476
	phpconfutils_extension_with	"tidy"			"tidy"			1 "$EPREFIX/usr"
471
	phpconfutils_extension_disable	"tokenizer"		"tokenizer"		0
477
	phpconfutils_extension_disable	"tokenizer"		"tokenizer"		0
472
	phpconfutils_extension_enable	"wddx"			"wddx"			1
478
	phpconfutils_extension_enable	"wddx"			"wddx"			1
473
	phpconfutils_extension_disable	"xml"			"xml"			0
479
	phpconfutils_extension_disable	"xml"			"xml"			0
474
	phpconfutils_extension_disable	"xmlreader"		"xmlreader"		0
480
	phpconfutils_extension_disable	"xmlreader"		"xmlreader"		0
475
	phpconfutils_extension_disable	"xmlwriter"		"xmlwriter"		0
481
	phpconfutils_extension_disable	"xmlwriter"		"xmlwriter"		0
476
	phpconfutils_extension_with	"xmlrpc"		"xmlrpc"		1
482
	phpconfutils_extension_with	"xmlrpc"		"xmlrpc"		1
477
	phpconfutils_extension_with	"xsl"			"xsl"			1
483
	phpconfutils_extension_with	"xsl"			"xsl"			1 "$EPREFIX/usr"
478
	phpconfutils_extension_enable	"zip"			"zip"			1
484
	phpconfutils_extension_enable	"zip"			"zip"			1
479
	phpconfutils_extension_with	"zlib"			"zlib"			1
485
	phpconfutils_extension_with	"zlib"			"zlib"			1 "$EPREFIX/usr"
480
	phpconfutils_extension_enable	"debug"			"debug"			0
486
	phpconfutils_extension_enable	"debug"			"debug"			0
481
487
482
	# DBA support
488
	# DBA support
Lines 491-517 Link Here
491
497
492
	# DBA drivers support
498
	# DBA drivers support
493
	phpconfutils_extension_with 	"cdb"			"cdb"			0
499
	phpconfutils_extension_with 	"cdb"			"cdb"			0
494
	phpconfutils_extension_with 	"db4"			"berkdb"		0
500
	phpconfutils_extension_with 	"db4"			"berkdb"		0 "$EPREFIX/usr"
495
	phpconfutils_extension_with 	"flatfile"		"flatfile"		0
501
	phpconfutils_extension_with 	"flatfile"		"flatfile"		0
496
	phpconfutils_extension_with 	"gdbm"			"gdbm"			0
502
	phpconfutils_extension_with 	"gdbm"			"gdbm"			0 "$EPREFIX/usr"
497
	phpconfutils_extension_with 	"inifile"		"inifile"		0
503
	phpconfutils_extension_with 	"inifile"		"inifile"		0
498
	phpconfutils_extension_with	"qdbm"			"qdbm"			0
504
	phpconfutils_extension_with	"qdbm"			"qdbm"			0 "$EPREFIX/usr"
499
505
500
	# Support for the GD graphics library
506
	# Support for the GD graphics library
501
	if use gd-external || phpconfutils_usecheck gd-external ; then
507
	if use gd-external || phpconfutils_usecheck gd-external ; then
502
		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "/usr"
508
		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "$EPREFIX/usr"
503
		phpconfutils_extension_with	"t1lib"		"truetype"		0 "/usr"
509
		phpconfutils_extension_with	"t1lib"		"truetype"		0 "$EPREFIX/usr"
504
		phpconfutils_extension_enable	"gd-jis-conv"	"cjk" 			0
510
		phpconfutils_extension_enable	"gd-jis-conv"	"cjk" 			0
505
		phpconfutils_extension_with 	"gd" 		"gd-external"		1 "/usr"
511
		phpconfutils_extension_with 	"gd" 		"gd-external"		1 "$EPREFIX/usr"
506
	else
512
	else
507
		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "/usr"
513
		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "$EPREFIX/usr"
508
		phpconfutils_extension_with	"t1lib"		"truetype"		0 "/usr"
514
		phpconfutils_extension_with	"t1lib"		"truetype"		0 "$EPREFIX/usr"
509
		phpconfutils_extension_enable	"gd-jis-conv"	"cjk"			0
515
		phpconfutils_extension_enable	"gd-jis-conv"	"cjk"			0
510
		phpconfutils_extension_with	"jpeg-dir"	"gd"			0 "/usr"
516
		phpconfutils_extension_with	"jpeg-dir"	"gd"			0 "$EPREFIX/usr"
511
		phpconfutils_extension_with 	"png-dir" 	"gd" 			0 "/usr"
517
		phpconfutils_extension_with 	"png-dir" 	"gd" 			0 "$EPREFIX/usr"
512
		phpconfutils_extension_with 	"xpm-dir" 	"xpm" 			0 "/usr"
518
		phpconfutils_extension_with 	"xpm-dir" 	"xpm" 			0 "$EPREFIX/usr"
513
		# enable gd last, so configure can pick up the previous settings
519
		# enable gd last, so configure can pick up the previous settings
514
		phpconfutils_extension_with 	"gd" 		"gd" 			0
520
		phpconfutils_extension_with 	"gd" 		"gd" 			0 "$EPREFIX/usr"
515
	fi
521
	fi
516
522
517
	# IMAP support
523
	# IMAP support
Lines 530-536 Link Here
530
		if has_version "<dev-db/firebird-2.0.3.12981.0-r1" ; then
536
		if has_version "<dev-db/firebird-2.0.3.12981.0-r1" ; then
531
			my_conf="${my_conf} --with-interbase=/opt"
537
			my_conf="${my_conf} --with-interbase=/opt"
532
		else
538
		else
533
			my_conf="${my_conf} --with-interbase=/usr"
539
			my_conf="${my_conf} --with-interbase=$EPREFIX/usr"
534
		fi
540
		fi
535
	fi
541
	fi
536
542
Lines 546-561 Link Here
546
552
547
	# MySQL support
553
	# MySQL support
548
	if use mysql ; then
554
	if use mysql ; then
549
		phpconfutils_extension_with	"mysql"			"mysql"		1 "/usr"
555
		phpconfutils_extension_with	"mysql"			"mysql"		1 "$EPREFIX/usr"
550
		phpconfutils_extension_with	"mysql-sock"		"mysql"		0 "/var/run/mysqld/mysqld.sock"
556
		phpconfutils_extension_with	"mysql-sock"		"mysql"		0 "$EPREFIX/var/run/mysqld/mysqld.sock"
551
	fi
557
	fi
552
558
553
	# MySQLi support
559
	# MySQLi support
554
	phpconfutils_extension_with		"mysqli"		"mysqli"	1 "/usr/bin/mysql_config"
560
	phpconfutils_extension_with		"mysqli"		"mysqli"	1 "$EPREFIX/usr/bin/mysql_config"
555
561
556
	# ODBC support
562
	# ODBC support
557
	if use odbc || phpconfutils_usecheck odbc ; then
563
	if use odbc || phpconfutils_usecheck odbc ; then
558
		phpconfutils_extension_with	"unixODBC"		"odbc"		1 "/usr"
564
		phpconfutils_extension_with	"unixODBC"		"odbc"		1 "$EPREFIX/usr"
559
565
560
		phpconfutils_extension_with	"adabas"		"adabas"	1
566
		phpconfutils_extension_with	"adabas"		"adabas"	1
561
		phpconfutils_extension_with	"birdstep"		"birdstep"	1
567
		phpconfutils_extension_with	"birdstep"		"birdstep"	1
Lines 595-609 Link Here
595
			OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g' | sed -e 's|-r.*||g'`"
601
			OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g' | sed -e 's|-r.*||g'`"
596
			phpconfutils_extension_with	"pdo-oci"	"oci8-instant-client"	1	"instantclient,/usr,${OCI8IC_PKG}"
602
			phpconfutils_extension_with	"pdo-oci"	"oci8-instant-client"	1	"instantclient,/usr,${OCI8IC_PKG}"
597
		fi
603
		fi
598
		phpconfutils_extension_with		"pdo-odbc"	"odbc"		1 "unixODBC,/usr"
604
		phpconfutils_extension_with		"pdo-odbc"	"odbc"		1 "unixODBC,$EPREFIX/usr"
599
		phpconfutils_extension_with		"pdo-pgsql"	"postgres"	1
605
		phpconfutils_extension_with		"pdo-pgsql"	"postgres"	1 "$EPREFIX/usr"
600
		phpconfutils_extension_with		"pdo-sqlite"	"sqlite"	1 "/usr"
606
		phpconfutils_extension_with		"pdo-sqlite"	"sqlite"	1 "$EPREFIX/usr"
601
	fi
607
	fi
602
608
603
	# readline/libedit support
609
	# readline/libedit support
604
	# You can use readline or libedit, but you can't use both
610
	# You can use readline or libedit, but you can't use both
605
	phpconfutils_extension_with			"readline"	"readline"	0
611
	phpconfutils_extension_with			"readline"	"readline"	0 "$EPREFIX/usr"
606
	phpconfutils_extension_with			"libedit"	"libedit"	0
612
	phpconfutils_extension_with			"libedit"	"libedit"	0 
607
613
608
	# Session support
614
	# Session support
609
	if ! use session && ! phpconfutils_usecheck session ; then
615
	if ! use session && ! phpconfutils_usecheck session ; then

Return to bug 195765