Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,17 +1,8 @@
|
||||
$NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
|
||||
$NetBSD: patch-configure,v 1.6 2014/03/19 21:50:23 asau Exp $
|
||||
|
||||
--- configure.orig 2013-08-14 06:04:57.000000000 +0000
|
||||
--- configure.orig 2014-03-05 08:26:39.000000000 +0000
|
||||
+++ configure
|
||||
@@ -20689,7 +20689,7 @@ _ACEOF
|
||||
cat>>Makefile.objects<<EOF
|
||||
|
||||
$ac_bdir$ac_hdrobj: $abs_srcdir/$ac_provsrc
|
||||
- dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$@
|
||||
+ dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@ && \$(SED) 's,PHP_,DTRACE_,g' \$@ > \$@.tmp && mv \$@.tmp \$@
|
||||
|
||||
\$(PHP_DTRACE_OBJS): $ac_bdir$ac_hdrobj
|
||||
|
||||
@@ -23476,7 +23476,7 @@ fi
|
||||
@@ -23554,7 +23554,7 @@ fi
|
||||
if test "$found_openssl" = "no"; then
|
||||
|
||||
if test "$PHP_OPENSSL_DIR" = "yes"; then
|
||||
@@ -20,7 +11,7 @@ $NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
|
||||
fi
|
||||
|
||||
for i in $PHP_OPENSSL_DIR; do
|
||||
@@ -25626,7 +25626,7 @@ $as_echo "yes" >&6; }
|
||||
@@ -25704,7 +25704,7 @@ $as_echo "yes" >&6; }
|
||||
PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
|
||||
|
||||
|
||||
@@ -29,7 +20,7 @@ $NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
|
||||
|
||||
|
||||
unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
|
||||
@@ -36872,7 +36872,7 @@ fi
|
||||
@@ -36944,7 +36944,7 @@ fi
|
||||
if test "$found_openssl" = "no"; then
|
||||
|
||||
if test "$PHP_OPENSSL_DIR" = "yes"; then
|
||||
@@ -38,7 +29,7 @@ $NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
|
||||
fi
|
||||
|
||||
for i in $PHP_OPENSSL_DIR; do
|
||||
@@ -51704,7 +51704,7 @@ fi
|
||||
@@ -51409,7 +51409,7 @@ fi
|
||||
if test "$found_openssl" = "no"; then
|
||||
|
||||
if test "$PHP_OPENSSL_DIR" = "yes"; then
|
||||
@@ -47,7 +38,7 @@ $NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
|
||||
fi
|
||||
|
||||
for i in $PHP_OPENSSL_DIR; do
|
||||
@@ -105814,12 +105814,7 @@ old_CC=$CC
|
||||
@@ -105616,12 +105616,7 @@ old_CC=$CC
|
||||
if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
|
||||
CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
|
||||
INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
|
||||
@@ -61,3 +52,57 @@ $NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
|
||||
fi
|
||||
|
||||
if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
|
||||
@@ -108735,7 +108730,7 @@ if test -z "$aix_libpath"; then aix_libp
|
||||
hardcode_shlibpath_var=no
|
||||
;;
|
||||
|
||||
- freebsd1*)
|
||||
+ freebsd1|freebsd1.*)
|
||||
ld_shlibs=no
|
||||
;;
|
||||
|
||||
@@ -109384,7 +109379,7 @@ dgux*)
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
;;
|
||||
|
||||
-freebsd1*)
|
||||
+freebsd1|freebsd1.*)
|
||||
dynamic_linker=no
|
||||
;;
|
||||
|
||||
@@ -109395,7 +109390,7 @@ freebsd* | dragonfly*)
|
||||
objformat=`/usr/bin/objformat`
|
||||
else
|
||||
case $host_os in
|
||||
- freebsd[123]*) objformat=aout ;;
|
||||
+ freebsd[123]|freebsd[123].*) objformat=aout ;;
|
||||
*) objformat=elf ;;
|
||||
esac
|
||||
fi
|
||||
@@ -111475,7 +111470,7 @@ if test -z "$aix_libpath"; then aix_libp
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
- freebsd[12]*)
|
||||
+ freebsd[12]|freebsd[12].*)
|
||||
# C++ shared libraries reported to be fairly broken before switch to ELF
|
||||
ld_shlibs_CXX=no
|
||||
;;
|
||||
@@ -113021,7 +113016,7 @@ dgux*)
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
;;
|
||||
|
||||
-freebsd1*)
|
||||
+freebsd1|freebsd1.*)
|
||||
dynamic_linker=no
|
||||
;;
|
||||
|
||||
@@ -113032,7 +113027,7 @@ freebsd* | dragonfly*)
|
||||
objformat=`/usr/bin/objformat`
|
||||
else
|
||||
case $host_os in
|
||||
- freebsd[123]*) objformat=aout ;;
|
||||
+ freebsd[123]|freebsd[123].*) objformat=aout ;;
|
||||
*) objformat=elf ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user