Projet

Général

Profil

« Précédent | Suivant » 

Révision 15f25984

Ajouté par Renato Botelho il y a presque 10 ans

Revert "Revert "Update php55 to 5.5.12""

Time to try 5.5.12 again

This reverts commit 3ae1e9d64cd449c1586c768c9cfaefa0e6409995.

Voir les différences:

pfPorts/php55/Makefile.ext
126 126
.endif
127 127

  
128 128
.if ${PHP_MODNAME} == "iconv"
129
CONFIGURE_ARGS+=--with-iconv
129
CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
130 130

  
131 131
USES+=	iconv:translit
132 132
.endif
......
206 206
.endif
207 207

  
208 208
.if ${PHP_MODNAME} == "odbc"
209
CONFIGURE_ARGS+=--enable-odbc
210

  
211
OPTIONS_DEFINE=	IODBC
209
LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
212 210

  
213
IODBC_DESC=	Use the iODBC driver instead of unixODBC
211
CONFIGURE_ARGS+=--enable-odbc \
212
		--with-unixODBC=${LOCALBASE}
214 213
.endif
215 214

  
216 215
.if ${PHP_MODNAME} == "openssl"
......
263 262
.endif
264 263

  
265 264
.if ${PHP_MODNAME} == "pdo_odbc"
266
OPTIONS_DEFINE= IODBC
267

  
268
IODBC_DESC=     Use the iODBC driver instead of unixODBC
265
LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
266
CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
269 267

  
270 268
USE_PHP=	pdo
271 269
USE_PHP_BUILD=	yes
......
336 334

  
337 335
.if ${PHP_MODNAME} == "simplexml"
338 336
CONFIGURE_ARGS+=--enable-simplexml \
337
		--with-pcre-dir=${LOCALBASE} \
339 338
		--with-libxml-dir=${LOCALBASE}
340 339

  
341
CFLAGS+=	-I${LOCALBASE}/include
342 340
USES+=		pkgconfig
343 341
USE_GNOME=	libxml2
344 342
.endif
......
430 428

  
431 429
.if ${PHP_MODNAME} == "xmlrpc"
432 430
CONFIGURE_ARGS+=--with-xmlrpc \
433
		--with-libxml-dir=${LOCALBASE}
431
		--with-libxml-dir=${LOCALBASE} \
432
		--with-iconv-dir=${LOCALBASE}
434 433

  
435
USES+=		iconv
434
USES+=		iconv:translit
436 435
USE_GNOME=	libxml2
437 436

  
438 437
PHP_HEADER_DIRS=libxmlrpc
......
560 559
	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
561 560
.endif
562 561

  
563
.if ${PHP_MODNAME} == "odbc"
564
.	if ${PORT_OPTIONS:MIODBC}
565
LIB_DEPENDS+=	libiodbc.so:${PORTSDIR}/databases/libiodbc
566

  
567
CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE}
568
.	else
569
LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
570

  
571
CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
572
.	endif
573
.endif
574

  
575 562
.if ${PHP_MODNAME} == "pdo_dblib"
576 563
.	if ${PORT_OPTIONS:MMSSQL}
577 564
LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds-msdblib
......
580 567
.	endif
581 568
.endif
582 569

  
583
.if ${PHP_MODNAME} == "pdo_odbc"
584
.	if ${PORT_OPTIONS:MIODBC}
585
LIB_DEPENDS+=	libiodbc.so:${PORTSDIR}/databases/libiodbc
586

  
587
CONFIGURE_ARGS+=--with-pdo-odbc=iODBC,${LOCALBASE}
588
.	else
589
LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
590

  
591
CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
592
.	endif
593
.endif
594

  
595 570
.if ${PHP_MODNAME} == "pdo_mysql"
596 571
.	if ${PORT_OPTIONS:MMYSQLND}
597 572
CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd

Formats disponibles : Unified diff