- fixed odbc.so linking (added odbc-fix patch)

- added one more fix to hyperwave-fix patch (now builds as module)
- updated shared patch (but more voodoo required for multiple SAPIs)

Changed files:
    php-hyperwave-fix.patch -> 1.4
    php-odbc-fix.patch -> 1.1
    php-shared.patch -> 1.6
    php.spec -> 1.230

diff --git a/php-hyperwave-fix.patch b/php-hyperwave-fix.patch
index 301ae4a2f46b936245763838d3dd94249f2f02bc..1b622a93dd1b8e06c26a05e8677f2abe9e190388 100644 (file)
--- a/php-hyperwave-fix.patch
+++ b/php-hyperwave-fix.patch
@@ -1,11 +1,27 @@
---- php-4.3.0/ext/hyperwave/config.m4.orig     Tue Mar 12 17:47:14 2002
-+++ php-4.3.0/ext/hyperwave/config.m4  Thu Jan  2 13:18:32 2003
-@@ -9,7 +9,7 @@
-   if test "$withval" != "no"; then
+--- php-4.3.0/ext/hyperwave/config.m4.orig     Thu Jan  2 23:17:53 2003
++++ php-4.3.0/ext/hyperwave/config.m4  Thu Jan  2 23:19:42 2003
+@@ -2,19 +2,12 @@
+ dnl $Id$
+ dnl
+ 
+-AC_MSG_CHECKING(for Hyperwave support)
+-AC_ARG_WITH(hyperwave,
+-[  --with-hyperwave        Include Hyperwave support],
+-[
+-  if test "$withval" != "no"; then
++PHP_ARG_WITH(hyperwave, for Hyperwave support,
++[  --with-hyperwave        Include Hyperwave support])
++
++  if test "$PHP_HYPERWAVE" != "no"; then
      AC_DEFINE(HYPERWAVE,1,[ ])
-     AC_MSG_RESULT(yes)
+-    AC_MSG_RESULT(yes)
 -    PHP_NEW_EXTENSION(hyperwave, hw.c hg_comm.c)
 +    PHP_NEW_EXTENSION(hyperwave, hw.c hg_comm.c, $ext_shared)
    else
      AC_DEFINE(HYPERWAVE,0,[ ])
-     AC_MSG_RESULT(no)
+-    AC_MSG_RESULT(no)
+   fi
+-],[
+-  AC_DEFINE(HYPERWAVE,0,[ ])
+-  AC_MSG_RESULT(no)
+-])

diff --git a/php-odbc-fix.patch b/php-odbc-fix.patch
new file mode 100644 (file)
index 0000000..c49f951
--- /dev/null
+++ b/php-odbc-fix.patch
@@ -0,0 +1,12 @@
+--- php-4.3.0/ext/odbc/config.m4.orig  Tue Nov 12 18:31:39 2002
++++ php-4.3.0/ext/odbc/config.m4       Thu Jan  2 22:34:43 2003
+@@ -539,6 +539,9 @@
+     if test "$shared" != "yes"; then
+       EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ODBC_LFLAGS"
+       EXTRA_LIBS="$EXTRA_LIBS $ODBC_LIBS"
++    else
++      ODBC_SHARED_LIBADD="$ODBC_LDFLAGS $ODBC_LIBS"
++      PHP_SUBST(ODBC_SHARED_LIBADD)
+     fi
+   fi
+   AC_DEFINE(HAVE_UODBC,1,[ ])

diff --git a/php-shared.patch b/php-shared.patch
index db51f989e1d8ef6bf33bc4008487c1117e9be6ba..6bccfa6e2ec569cd4990aa6858903f05820be5d9 100644 (file)
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -1,82 +1,48 @@
-diff -urN php-4_2_0RC3.org/Makefile.in php-4_2_0RC3/Makefile.in
---- php-4_2_0RC3.org/Makefile.in       Sat Apr 13 01:18:28 2002
-+++ php-4_2_0RC3/Makefile.in   Sat Apr 13 01:56:27 2002
-@@ -2,40 +2,67 @@
- ZEND_DIR = $(srcdir)/Zend
- SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) $(CLI_DIR) . $(PEAR_DIR)
+--- php-4.3.0/Makefile.global.orig     Tue Nov 12 18:40:38 2002
++++ php-4.3.0/Makefile.global  Thu Jan  2 23:29:35 2003
+@@ -10,8 +10,11 @@
  
--LTLIBRARY_NAME = libphp4.la
--LTLIBRARY_SOURCES = stub.c
--
--LTLIBRARY_DEPENDENCIES = \
-+libexec_LTLIBRARIES = libphp_common.la libphp4.la
-+libphp4_la_NAME = libphp4.la
-+libphp_common_la_NAME = libphp_common.la
-+libphp4_la_SOURCES = stub.c
-+libphp_la_common_SOURCES = stub.c
-+
-+libphp4_la_DEPENDENCIES = \
-+              libphp_common.la \
-+              sapi/$(PHP_SAPI)/libsapi.la
-+              
-+libphp_common_la_DEPENDENCIES = \
-               Zend/libZend.la \
--              sapi/$(PHP_SAPI)/libsapi.la \
-               main/libmain.la \
-               $(REGEX_LIB) \
-               $(EXT_LTLIBS) \
-               $(TSRM_LIB)
- 
--LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
--LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS)
-+libphp4_la_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
-+libphp4_la_LIBADD = $(libphp4_la_DEPENDENCIES) $(EXTRA_LIBS)
- 
- PROGRAM_NAME         = php
- PROGRAM_SOURCES      = stub.c
--PROGRAM_LDADD        = libphp4.la $(EXT_PROGRAM_LDADD)
-+PROGRAM_LDADD        = libphp_common.la sapi/cgi/libsapi.la $(EXT_PROGRAM_LDADD)
- PROGRAM_LDFLAGS      = -export-dynamic        
- PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
+ build-modules: $(PHP_MODULES)
  
--targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
-+targets = $(libexec_LTLIBRARIES) $(PHP_PROGRAM)
- 
- install_targets = install-sapi install-modules
+-libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+-      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
++libphp_common.la: $(PHP_GLOBAL_OBJS)
++      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS)  $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION) -version-info 0:0:0
++
++libphp4.la: libphp_common.la $(PHP_SAPI_OBJS)
++      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
  
- include $(top_srcdir)/build/rules.mk
--include $(top_srcdir)/build/library.mk
- include $(top_srcdir)/build/program.mk
+ libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+       $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so
+@@ -20,8 +23,17 @@
  
-+libphp_common_la_LDFLAGS = -rpath $(phptempdir) -release $(PHP_VERSION) -version-info 0:0:0 $(LDFLAGS) $(PHP_RPATHS)
-+libphp_common_la_LIBADD = $(libphp_common_la_DEPENDENCIES) $(EXTRA_LIBS)
-+
-+libphp_common_la_OBJECTS = $(libphp_common_la_SOURCES:.c=.lo) $(libphp_common_la_OBJECTS_X)
-+
-+$(libphp_common_la_NAME): $(libphp_common_la_OBJECTS) $(libphp_common_la_DEPENDENCIES)
-+      $(LINK) $(libphp_common_la_LDFLAGS) $(libphp_common_la_OBJECTS) $(libphp_common_la_LIBADD)
-+
-+libphp4_la_OBJECTS = $(libphp4_la_SOURCES:.c=.lo) $(libphp4_la_OBJECTS_X)
-+
-+$(libphp4_la_NAME): $(libphp4_la_OBJECTS) $(libphp4_la_DEPENDENCIES)
-+      $(LINK) $(libphp4_la_LDFLAGS) $(libphp4_la_OBJECTS) $(libphp4_la_LIBADD)
-+
- install-sapi:
--      @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
-+      @$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la
-+      @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la
+ install-sapi: libphp4.la
+       @echo "Installing PHP SAPI module"
++      -@$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la >/dev/null 2>&1
+       -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
        -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-       -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
-               for i in 0.0.0 0.0 0; do \
-                       if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
-+                              break;  \
-+                      fi; \
-+              done; \
-+      fi
 +      -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \
 +              for i in 0.0.0 0.0 0; do \
 +                      if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \
 +                              $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \
-                               $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
-                               break; \
-                       fi; \
++                              break; \
++                      fi; \
++              done; \
++      fi
+       -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
+               for i in 0.0.0 0.0 0; do \
+                       if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
+--- php-4.3.0/sapi/cgi/Makefile.frag.orig      Sun Sep 29 18:22:48 2002
++++ php-4.3.0/sapi/cgi/Makefile.frag   Thu Jan  2 23:33:29 2003
+@@ -1,2 +1,2 @@
+-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
++$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS)
+       $(BUILD_CGI)
+--- php-4.3.0/sapi/cli/Makefile.frag.orig      Sun Sep 29 18:22:48 2002
++++ php-4.3.0/sapi/cli/Makefile.frag   Thu Jan  2 23:35:16 2003
+@@ -1,4 +1,4 @@
+-$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
++$(SAPI_CLI_PATH): libphp_common.la $(PHP_CLI_OBJS)
+       $(BUILD_CLI)
+ 
+ install-cli: $(SAPI_CLI_PATH)

diff --git a/php.spec b/php.spec
index 7f9f2d3eb20c6ff596247a9cb51cd050480fa7b5..c4e28fb26d3a4447a65c9efc30bb5599b85794a1 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -1,7 +1,6 @@
 #
 # TODO:
-# - odbc.so isn't linked with -lodbc* (shared odbc is broken in config.m4)
-# - BUILD!!! (shared patch, libphp_common, SAPIs)
+# - BUILD!!! (more voodoo for multiple SAPIs; fix for new libtool)
 # - fastcgi option in cgi SAPI?
 # - add cli SAPI?
 # - check/update "experimental" in descriptions
@@ -86,6 +85,7 @@ Patch7:               %{name}-wddx-fix.patch
 Patch8:                %{name}-cpdf-fix.patch
 #Patch9:               %{name}-session-fix-shared.patch
 Patch10:       %{name}-hyperwave-fix.patch
+Patch11:       %{name}-odbc-fix.patch
 #Patch11:      %{name}-openssl-for-ext-only.patch
 Patch12:       %{name}-java-fix.patch
 Patch13:       %{name}-mcal-shared-lib.patch
@@ -1324,7 +1324,7 @@ Repozytorium Aplikacji. Ten pakiet zawiera aplikacje potrzebne do
 
 %prep
 %setup -q
-#%patch0 -p1   -- needs update!
+%patch0 -p1
 %patch1 -p1
 #%patch2 -p1   -- obsolete
 %patch2 -p1
@@ -1336,6 +1336,7 @@ Repozytorium Aplikacji. Ten pakiet zawiera aplikacje potrzebne do
 %patch8 -p1
 #%patch9 -p1   -- obsolete
 %patch10 -p1
+%patch11 -p1
 #%patch11 -p1  -- obsolete (openssl used also in common part)
 #%patch12 -p1  -- needs update? to check
 %patch13 -p1
@@ -1364,12 +1365,14 @@ EXTENSION_DIR="%{extensionsdir}"; export EXTENSION_DIR
 %{__libtoolize}
 %{__aclocal}
 autoconf
-#for i in cgi fastcgi apxs ; do
+#for i in cgi cli fastcgi apxs ; do
 PROG_SENDMAIL="/usr/lib/sendmail"; export PROG_SENDMAIL
 for i in cgi apxs ; do
 %configure \
        `[ $i = cgi ] && echo --enable-discard-path` \
-       `[ $i = fastcgi ] && echo --enable-discard-path --with-fastcgi=/usr` \
+       `[ $i != cli ] && echo --disable-cli` \
+       `[ $i = cli ] && echo --disable-cgi` \
+       `[ $i = fastcgi ] && --enable-fastcgi --with-fastcgi=/usr` \
 %if %{_apache2}
        `[ $i = apxs ] && echo --with-apxs2=%{apxs}` \
 %else
@@ -1380,7 +1383,6 @@ for i in cgi apxs ; do
        --%{!?debug:dis}%{?debug:en}able-debug \
        --enable-bcmath=shared \
        --enable-calendar=shared \
-       --disable-cli \
        --enable-ctype=shared \
        --enable-dba=shared \
        --enable-dbx=shared \
@@ -1465,6 +1467,8 @@ for i in cgi apxs ; do
        --with-zip=shared \
        --with-zlib=shared \
        --with-zlib-dir=shared,/usr
+
+cp -f Makefile Makefile.$i
 done
 
 #      --with-sablot-js=shared,no
@@ -1477,15 +1481,19 @@ done
 #      --with-qtdom=shared
 
 %{__make}
-%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" -C sapi/cgi
+
+cp -f Makefile.cgi Makefile
+#%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" -C sapi/cgi
+%{__make} sapi/cgi/php
+cp -f Makefile.apxs Makefile
 
 # Kill -rpath from php binary and libphp4.so
-perl -pi -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-perl -pi -e 's|^runpath_var=.*|runpath_var=|g' libtool
-%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" php
+#perl -pi -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+#perl -pi -e 's|^runpath_var=.*|runpath_var=|g' libtool
+#%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" php
 
-perl -pi -e 's|^hardcode_into_libs=.*|hardcode_into_libs=no|g' libtool
-rm libphp4.la ; %{__make} libphp4.la
+#perl -pi -e 's|^hardcode_into_libs=.*|hardcode_into_libs=no|g' libtool
+#rm libphp4.la ; %{__make} libphp4.la
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -1501,7 +1509,8 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache},%{_sysconfdir}/{apache,cgi}}
 
 %{?_with_java:install ext/java/php_java.jar $RPM_BUILD_ROOT%{_libdir}}
 
-install .libs/php $RPM_BUILD_ROOT%{_bindir}/php
+#install .libs/php $RPM_BUILD_ROOT%{_bindir}/php
+install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php
 
 install php.ini        $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 install %{SOURCE6} %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}
@@ -1513,7 +1522,7 @@ install %{SOURCE1} .
 
 mv -f Zend/LICENSE{,.Zend}
 
-mkdir $RPM_BUILD_ROOT%{php_pear_dir}/{Auth,Science,HTML/Template}
+install -d $RPM_BUILD_ROOT%{php_pear_dir}/{Auth,Science,HTML/Template}
 
 %clean
 rm -rf $RPM_BUILD_ROOT