upgrade to php-4.1.2
closes a security issue in multipart form handling (buffer overflow) temporarily disable the freetds flavour, since the m4 patch cannot seem to be regenerated
This commit is contained in:
avsm
parent
c5f5d41a99
commit
13141e0740
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.63 2002/01/09 16:00:51 jcs Exp $
|
||||
# $OpenBSD: Makefile,v 1.64 2002/03/03 12:13:29 avsm Exp $
|
||||
|
||||
MULTI_PACKAGES= -pear
|
||||
SUBPACKAGE?=
|
||||
@ -10,7 +10,7 @@ COMMENT-pear= "collection of base classes for common PHP tasks"
|
||||
# and has Apache that supports DSO's.
|
||||
ONLY_FOR_ARCHS= i386 m68k sparc
|
||||
|
||||
V= 4.1.1
|
||||
V= 4.1.2
|
||||
DISTNAME= php-${V}
|
||||
PKGNAME= php4-${V}
|
||||
FULLPKGNAME-pear= php4-pear-${V}
|
||||
@ -54,7 +54,9 @@ USE_LIBTOOL= Yes
|
||||
|
||||
FLAVORS+= gdbm gettext imap ldap mhash mm recode snmp
|
||||
FLAVORS+= gd no_x11 pdflib mcrypt curl
|
||||
FLAVORS+= dbase filepro mysql mysql_bundled postgresql iodbc freetds
|
||||
FLAVORS+= dbase filepro mysql mysql_bundled postgresql iodbc
|
||||
# FLAVORS+= freetds
|
||||
|
||||
FLAVOR?=
|
||||
|
||||
.if ${FLAVOR:L:Mcurl}
|
||||
@ -196,12 +198,12 @@ LIB_DEPENDS+= iodbc.2::databases/iodbc
|
||||
CONFIGURE_ARGS+= --without-iodbc
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Mfreetds}
|
||||
CONFIGURE_ARGS+= --with-sybase-ct=${LOCALBASE}
|
||||
LIB_DEPENDS+= tds.0,ct.0::databases/freetds
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-sybase-ct
|
||||
.endif
|
||||
# .if ${FLAVOR:L:Mfreetds}
|
||||
# CONFIGURE_ARGS+= --with-sybase-ct=${LOCALBASE}
|
||||
# LIB_DEPENDS+= tds.0,ct.0::databases/freetds
|
||||
# .else
|
||||
# CONFIGURE_ARGS+= --without-sybase-ct
|
||||
# .endif
|
||||
|
||||
.if ${SUBPACKAGE} == "-pear"
|
||||
LIB_DEPENDS=
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (php-4.1.1.tar.gz) = 776362ff53bf6ea77b60496f6632b6b6
|
||||
RMD160 (php-4.1.1.tar.gz) = f4933adeeec47b024005bd6b5716f466764c2674
|
||||
SHA1 (php-4.1.1.tar.gz) = 3a926707819f5ea0dfa03785078f96a39d85e086
|
||||
MD5 (php-4.1.2.tar.gz) = 75a62553076c20e91d3be575ce158be2
|
||||
RMD160 (php-4.1.2.tar.gz) = a072152d4fb37cd0f78a5bbff3c2d620394be403
|
||||
SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.1 2001/12/18 01:40:48 avsm Exp $
|
||||
--- aclocal.m4.orig Mon Dec 17 18:41:24 2001
|
||||
+++ aclocal.m4 Mon Dec 17 18:42:41 2001
|
||||
@@ -2110,7 +2110,14 @@ old_postuninstall_cmds=
|
||||
|
||||
if test -n "$RANLIB"; then
|
||||
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
||||
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||
+ case "$host_os" in
|
||||
+ openbsd*)
|
||||
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||
+ ;;
|
||||
+ esac
|
||||
fi
|
||||
|
||||
# Allow CC to be a program name with arguments.
|
||||
@@ -2513,7 +2520,9 @@ cygwin* | mingw* | pw32* )
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
-
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
esac
|
||||
|
||||
ld_shlibs=yes
|
||||
@@ -2917,10 +2926,24 @@ else
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
- hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ else
|
||||
+ case "$host_os" in
|
||||
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='-R$libdir'
|
||||
+ ;;
|
||||
+ *)
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||
+ ;;
|
||||
+ esac
|
||||
+ fi
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -3394,9 +3417,25 @@ newsos6)
|
||||
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
- if test "$with_gnu_ld" = yes; then
|
||||
- need_lib_prefix=no
|
||||
- need_version=no
|
||||
+ need_lib_prefix=no
|
||||
+ need_version=no
|
||||
+ sys_lib_search_path_spec="/usr/lib"
|
||||
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
|
||||
+ file_magic_cmd=/usr/bin/file
|
||||
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
||||
+ case "$host_os" in
|
||||
+ openbsd2.[89] | openbsd2.[89].*)
|
||||
+ shlibpath_overrides_runpath=no
|
||||
+ ;;
|
||||
+ *)
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
+ ;;
|
||||
+ esac
|
||||
+ else
|
||||
+ deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
fi
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
@ -1,6 +1,16 @@
|
||||
--- configure.orig Wed Dec 26 04:43:05 2001
|
||||
+++ configure Fri Dec 28 11:47:29 2001
|
||||
@@ -24893,22 +24893,22 @@ EOF
|
||||
$OpenBSD: patch-configure,v 1.10 2002/03/03 12:13:29 avsm Exp $
|
||||
--- configure.orig Wed Feb 27 09:18:32 2002
|
||||
+++ configure Sun Mar 3 11:22:25 2002
|
||||
@@ -4644,7 +4644,7 @@ if test "${with_thttpd+set}" = set; then
|
||||
|
||||
if test -n "$GCC"; then
|
||||
|
||||
- gcc_arg_name=ac_cv_gcc_arg_rdynamc
|
||||
+ gcc_arg_name=ac_cv_gcc_arg_rdynamic
|
||||
echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
|
||||
echo "configure:4650: checking whether $CC supports -rdynamic" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
|
||||
@@ -24916,22 +24916,22 @@ EOF
|
||||
fi
|
||||
|
||||
|
||||
@ -27,7 +37,7 @@
|
||||
|
||||
|
||||
;;
|
||||
@@ -24947,22 +24947,22 @@ EOF
|
||||
@@ -24970,22 +24970,22 @@ EOF
|
||||
esac
|
||||
|
||||
|
||||
@ -54,7 +64,7 @@
|
||||
|
||||
|
||||
;;
|
||||
@@ -24974,22 +24974,22 @@ EOF
|
||||
@@ -24997,22 +24997,22 @@ EOF
|
||||
esac
|
||||
|
||||
|
||||
@ -81,7 +91,7 @@
|
||||
|
||||
|
||||
;;
|
||||
@@ -25134,7 +25134,7 @@ EOF
|
||||
@@ -25157,7 +25157,7 @@ EOF
|
||||
old_LIBS=$LIBS
|
||||
LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB"
|
||||
if test $PHP_KERBEROS != "no"; then
|
||||
@ -90,343 +100,7 @@
|
||||
fi
|
||||
|
||||
if test "$cross_compiling" = yes; then
|
||||
@@ -52283,33 +52283,6 @@ EOF
|
||||
fi
|
||||
|
||||
|
||||
- case cs in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
- if test "$ext_shared" = "yes"; then
|
||||
-
|
||||
- SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD"
|
||||
-
|
||||
- else
|
||||
-
|
||||
- case cs in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
-
|
||||
- LIBS="-lcs $LIBS"
|
||||
-
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
- fi
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
case ct in
|
||||
c|c_r|pthread*) ;;
|
||||
*)
|
||||
@@ -52337,214 +52310,22 @@ EOF
|
||||
esac
|
||||
|
||||
|
||||
- case comn in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
- if test "$ext_shared" = "yes"; then
|
||||
-
|
||||
- SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD"
|
||||
-
|
||||
- else
|
||||
-
|
||||
- case comn in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
-
|
||||
- LIBS="-lcomn $LIBS"
|
||||
-
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
- fi
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
- case intl in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
- if test "$ext_shared" = "yes"; then
|
||||
-
|
||||
- SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD"
|
||||
-
|
||||
- else
|
||||
-
|
||||
- case intl in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
-
|
||||
- LIBS="-lintl $LIBS"
|
||||
-
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
- fi
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
|
||||
-
|
||||
- echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
|
||||
-echo "configure:52398: checking for netg_errstr in -ltcl" >&5
|
||||
-ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'`
|
||||
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
- echo $ac_n "(cached) $ac_c" 1>&6
|
||||
-else
|
||||
- ac_save_LIBS="$LIBS"
|
||||
-LIBS="-ltcl
|
||||
- $SYBASE_CT_LIBS
|
||||
- $LIBS"
|
||||
-cat > conftest.$ac_ext <<EOF
|
||||
-#line 52408 "configure"
|
||||
-#include "confdefs.h"
|
||||
-/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
-char netg_errstr();
|
||||
-
|
||||
-int main() {
|
||||
-netg_errstr()
|
||||
-; return 0; }
|
||||
-EOF
|
||||
-if { (eval echo configure:52419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
- rm -rf conftest*
|
||||
- eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
-else
|
||||
- echo "configure: failed program was:" >&5
|
||||
- cat conftest.$ac_ext >&5
|
||||
- rm -rf conftest*
|
||||
- eval "ac_cv_lib_$ac_lib_var=no"
|
||||
-fi
|
||||
-rm -f conftest*
|
||||
-LIBS="$ac_save_LIBS"
|
||||
-
|
||||
-fi
|
||||
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
- echo "$ac_t""yes" 1>&6
|
||||
-
|
||||
-
|
||||
- case tcl in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
- if test "$ext_shared" = "yes"; then
|
||||
-
|
||||
- SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD"
|
||||
-
|
||||
- else
|
||||
-
|
||||
- case tcl in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
-
|
||||
- LIBS="-ltcl $LIBS"
|
||||
-
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
- fi
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
-else
|
||||
- echo "$ac_t""no" 1>&6
|
||||
-
|
||||
-
|
||||
- case sybtcl in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
- if test "$ext_shared" = "yes"; then
|
||||
-
|
||||
- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
|
||||
-
|
||||
- else
|
||||
-
|
||||
- case sybtcl in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
-
|
||||
- LIBS="-lsybtcl $LIBS"
|
||||
-
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
- fi
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
-fi
|
||||
-
|
||||
-
|
||||
- echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
|
||||
-echo "configure:52498: checking for insck__getVdate in -linsck" >&5
|
||||
-ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
|
||||
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
- echo $ac_n "(cached) $ac_c" 1>&6
|
||||
-else
|
||||
- ac_save_LIBS="$LIBS"
|
||||
-LIBS="-linsck -L$SYBASE_CT_LIBDIR $LIBS"
|
||||
-cat > conftest.$ac_ext <<EOF
|
||||
-#line 52506 "configure"
|
||||
-#include "confdefs.h"
|
||||
-/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
-char insck__getVdate();
|
||||
-
|
||||
-int main() {
|
||||
-insck__getVdate()
|
||||
-; return 0; }
|
||||
-EOF
|
||||
-if { (eval echo configure:52517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
- rm -rf conftest*
|
||||
- eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
-else
|
||||
- echo "configure: failed program was:" >&5
|
||||
- cat conftest.$ac_ext >&5
|
||||
- rm -rf conftest*
|
||||
- eval "ac_cv_lib_$ac_lib_var=no"
|
||||
-fi
|
||||
-rm -f conftest*
|
||||
-LIBS="$ac_save_LIBS"
|
||||
-
|
||||
-fi
|
||||
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
- echo "$ac_t""yes" 1>&6
|
||||
-
|
||||
- case insck in
|
||||
+ case tds in
|
||||
c|c_r|pthread*) ;;
|
||||
*)
|
||||
|
||||
if test "$ext_shared" = "yes"; then
|
||||
|
||||
- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
|
||||
+ SYBASE_CT_SHARED_LIBADD="-ltds $SYBASE_CT_SHARED_LIBADD"
|
||||
|
||||
else
|
||||
|
||||
- case insck in
|
||||
+ case tds in
|
||||
c|c_r|pthread*) ;;
|
||||
*)
|
||||
|
||||
|
||||
- LIBS="-linsck $LIBS"
|
||||
+ LIBS="-ltds $LIBS"
|
||||
|
||||
|
||||
;;
|
||||
@@ -52555,81 +52336,10 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
|
||||
;;
|
||||
esac
|
||||
|
||||
-else
|
||||
- echo "$ac_t""no" 1>&6
|
||||
-fi
|
||||
-
|
||||
- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
|
||||
-echo "configure:52564: checking for bsd_tcp in -linsck" >&5
|
||||
-ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
|
||||
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
- echo $ac_n "(cached) $ac_c" 1>&6
|
||||
-else
|
||||
- ac_save_LIBS="$LIBS"
|
||||
-LIBS="-linsck -L$SYBASE_CT_LIBDIR $LIBS"
|
||||
-cat > conftest.$ac_ext <<EOF
|
||||
-#line 52572 "configure"
|
||||
-#include "confdefs.h"
|
||||
-/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
-char bsd_tcp();
|
||||
-
|
||||
-int main() {
|
||||
-bsd_tcp()
|
||||
-; return 0; }
|
||||
-EOF
|
||||
-if { (eval echo configure:52583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
- rm -rf conftest*
|
||||
- eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
-else
|
||||
- echo "configure: failed program was:" >&5
|
||||
- cat conftest.$ac_ext >&5
|
||||
- rm -rf conftest*
|
||||
- eval "ac_cv_lib_$ac_lib_var=no"
|
||||
-fi
|
||||
-rm -f conftest*
|
||||
-LIBS="$ac_save_LIBS"
|
||||
-
|
||||
-fi
|
||||
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
- echo "$ac_t""yes" 1>&6
|
||||
|
||||
- case insck in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
- if test "$ext_shared" = "yes"; then
|
||||
-
|
||||
- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
|
||||
-
|
||||
- else
|
||||
-
|
||||
- case insck in
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
-
|
||||
-
|
||||
- LIBS="-linsck $LIBS"
|
||||
-
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
- fi
|
||||
-
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-else
|
||||
- echo "$ac_t""no" 1>&6
|
||||
+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct -ltds"
|
||||
fi
|
||||
|
||||
-fi
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
|
||||
echo "configure:52635: checking whether to enable System V semaphore support" >&5
|
||||
# Check whether --enable-sysvsem or --disable-sysvsem was given.
|
||||
@@ -57538,7 +57248,7 @@ unset with_pic
|
||||
@@ -57561,7 +57561,7 @@ unset with_pic
|
||||
|
||||
case $php_build_target in
|
||||
program|static)
|
||||
@ -435,7 +109,7 @@
|
||||
if test "$lib_build_shared" != "yes"; then
|
||||
enable_shared=no
|
||||
fi
|
||||
@@ -57547,7 +57257,7 @@ program|static)
|
||||
@@ -57570,7 +57570,7 @@ program|static)
|
||||
;;
|
||||
shared)
|
||||
enable_static=no
|
||||
@ -444,86 +118,3 @@
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version"
|
||||
;;
|
||||
esac
|
||||
@@ -60620,7 +60330,14 @@ old_postuninstall_cmds=
|
||||
|
||||
if test -n "$RANLIB"; then
|
||||
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
||||
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||
+ case "$host_os" in
|
||||
+ openbsd*)
|
||||
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||
+ ;;
|
||||
+ esac
|
||||
fi
|
||||
|
||||
# Allow CC to be a program name with arguments.
|
||||
@@ -61117,7 +60834,9 @@ cygwin* | mingw* | pw32* )
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
-
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
esac
|
||||
|
||||
ld_shlibs=yes
|
||||
@@ -61521,10 +61240,24 @@ else
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
- hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ else
|
||||
+ case "$host_os" in
|
||||
+ openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*)
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='-R$libdir'
|
||||
+ ;;
|
||||
+ *)
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||
+ ;;
|
||||
+ esac
|
||||
+ fi
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -62001,9 +61734,25 @@ newsos6)
|
||||
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
- if test "$with_gnu_ld" = yes; then
|
||||
- need_lib_prefix=no
|
||||
- need_version=no
|
||||
+ need_lib_prefix=no
|
||||
+ need_version=no
|
||||
+ sys_lib_search_path_spec="/usr/lib"
|
||||
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
|
||||
+ file_magic_cmd=/usr/bin/file
|
||||
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ deplibs_check_method='file_magic ELF 0-90-9*-bit LMSB shared object'
|
||||
+ case "$host_os" in
|
||||
+ openbsd2.89 | openbsd2.89.*)
|
||||
+ shlibpath_overrides_runpath=no
|
||||
+ ;;
|
||||
+ *)
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
+ ;;
|
||||
+ esac
|
||||
+ else
|
||||
+ deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
fi
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
$OpenBSD: patch-ext_sybase_ct_config_m4,v 1.1 2002/01/09 16:00:51 jcs Exp $
|
||||
--- ext/sybase_ct/config.m4.orig Fri Jun 22 10:52:25 2001
|
||||
+++ ext/sybase_ct/config.m4 Fri Dec 28 11:50:14 2001
|
||||
@@ -19,21 +19,27 @@ if test "$PHP_SYBASE_CT" != "no"; then
|
||||
|
||||
PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
|
||||
PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
|
||||
- PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
|
||||
- PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
|
||||
- PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
|
||||
- PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
|
||||
+ if test -f $SYBASE_CT_INCDIR/tds.h; then
|
||||
+ PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
|
||||
+ PHP_ADD_LIBRARY(tds,, SYBASE_CT_SHARED_LIBADD)
|
||||
+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct -ltds"
|
||||
+ else
|
||||
+ PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
|
||||
+ PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
|
||||
+ PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
|
||||
+ PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
|
||||
|
||||
- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
|
||||
+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
|
||||
|
||||
- AC_CHECK_LIB(tcl, netg_errstr, [
|
||||
- PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
|
||||
- ],[
|
||||
- PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
|
||||
- ],[
|
||||
- $SYBASE_CT_LIBS
|
||||
- ])
|
||||
+ PHP_CHECK_LIBRARY(tcl, netg_errstr, [
|
||||
+ PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
|
||||
+ ],[
|
||||
+ PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
|
||||
+ ],[
|
||||
+ $SYBASE_CT_LIBS
|
||||
+ ])
|
||||
|
||||
- AC_CHECK_LIB(insck, insck__getVdate, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
|
||||
- AC_CHECK_LIB(insck, bsd_tcp, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
|
||||
+ PHP_CHECK_LIBRARY(insck, insck__getVdate, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
|
||||
+ PHP_CHECK_LIBRARY(insck, bsd_tcp, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
|
||||
+ fi
|
||||
fi
|
||||
Loading…
x
Reference in New Issue
Block a user