OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   20-Feb-2003 10:33:33
  Branch: HEAD                             Handle: 2003022009333102

  Modified files:
    openpkg-src/php         php.spec
    openpkg-web             news.txt

  Log:
    add all the build options from apache package

  Summary:
    Revision    Changes     Path
    1.36        +223 -3     openpkg-src/php/php.spec
    1.3375      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/php/php.spec
  ============================================================================
  $ cvs diff -u -r1.35 -r1.36 php.spec
  --- openpkg-src/php/php.spec  18 Feb 2003 10:22:24 -0000      1.35
  +++ openpkg-src/php/php.spec  20 Feb 2003 09:33:33 -0000      1.36
  @@ -33,16 +33,117 @@
   Group:        Language
   License:      PHP
   Version:      4.3.1
  -Release:      20030218
  +Release:      20030220
   
   #   list of sources
   Source0:      http://www.php.net/distributions/php-%{version}.tar.gz
   
  +#   package options (analog to apache.spec)
  +%option       with_calendar   no
  +%option       with_mysql      no
  +%option       with_gd         no
  +%option       with_db         no
  +%option       with_debug      no
  +%option       with_pdflib     no
  +%option       with_zlib       no
  +%option       with_bzip2      no
  +%option       with_openssl    no
  +%option       with_openldap   no
  +%option       with_mm         no
  +%option       with_pcre       no
  +%option       with_ftp        no
  +%option       with_java       no
  +%option       with_oci7       no
  +%option       with_oci8       no
  +%option       with_freetype   no
  +%option       with_gettext    no
  +%option       with_imap       no
  +%option       with_xml        no
  +%option       with_dom        no
  +%option       with_bc         no
  +%option       with_transsid   no
  +%option       with_curl       no
  +%option       with_mhash      no
  +%option       with_wddx       no
  +%option       with_gdbm       no
  +%option       with_versioning no
  +
  +#   fixing implicit inter-module dependencies and correlations
  +%if "%{with_freetype}" == "yes"
  +%undefine     with_gd
  +%define       with_gd         yes
  +%endif
  +%if "%{with_mysql}" == "yes" || "%{with_pdflib}" == "yes" || "%{with_gd}" == "yes" 
|| "%{with_dom}" == "yes"
  +%undefine     with_zlib
  +%define       with_zlib       yes
  +%endif
  +
  +
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc, sed, flex, bison
   PreReq:       OpenPKG, openpkg >= 20020206
  +%if "%{with_mysql}" == "yes"
  +BuildPreReq:  MYSQL
  +%endif
  +%if "%{with_gd}" == "yes"
  +BuildPreReq:  GD, jpeg, png
  +%endif
  +%if "%{with_db}" == "yes"
  +BuildPreReq:  db
  +%endif
  +%if "%{with_pdflib}" == "yes"
  +BuildPreReq:  pdflib, jpeg, png
  +%endif
  +%if "%{with_zlib}" == "yes"
  +BuildPreReq:  zlib
  +%endif
  +%if "%{with_bzip2}" == "yes"
  +BuildPreReq:  bzip2
  +%endif
  +%if "%{with_openssl}" == "yes"
  +BuildPreReq:  openssl
  +%endif
  +%if "%{with_openldap}" == "yes"
  +BuildPreReq:  openldap
  +%endif
  +%if "%{with_mm}" == "yes"
  +BuildPreReq:  mm
  +%endif
  +%if "%{with_pcre}" == "yes"
  +BuildPreReq:  pcre
  +%endif
  +%if "%{with_java}" == "yes"
  +BuildPreReq:  j2se
  +%endif
  +%if "%{with_freetype}" == "yes"
  +BuildPreReq:  freetype
  +%endif
  +%if "%{with_gettext}" == "yes"
  +BuildPreReq:  gettext, libiconv
  +%endif
  +%if "%{with_imap}" == "yes"
  +BuildPreReq:  imap
  +%endif
  +%if "%{with_xml}" == "yes"
  +BuildPreReq:  expat
  +%endif
  +%if "%{with_dom}" == "yes"
  +BuildPreReq:  libxml, libxslt
  +%endif
  +%if "%{with_curl}" == "yes"
  +BuildPreReq:  curl
  +%endif
  +%if "%{with_mhash}" == "yes"
  +BuildPreReq:  mhash
  +%endif
  +%if "%{with_gdbm}" == "yes"
  +BuildPreReq:  gdbm, gdbm::with_ndbm = yes
  +%endif
  +%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
  +BuildPreReq:  ORACLE
  +%endif
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -56,11 +157,119 @@
       %setup -q
   
   %build
  +    cflags="%{l_cflags -O}"
  +    ldflags=""
  +    libs=""
  +%if "%{with_gdbm}" == "yes"
  +    cflags="$cflags -I%{l_prefix}/include"
  +    ldflags="$ldflags -L%{l_prefix}/lib"
  +    libs="$libs -lndbm -lgdbm"
  +%endif
       CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O}" \
  +    CFLAGS="$cflags" \
  +    LDFLAGS="$ldflags" \
  +    LIBS="$libs" \
       ./configure \
           --prefix=%{l_prefix} \
           --with-config-file-path=%{l_prefix}/etc/php \
  +%if "%{with_calendar}" == "yes"
  +        --enable-calendar \
  +%endif
  +%if "%{with_mysql}" == "yes"
  +        --with-mysql=%{l_prefix} \
  +%endif
  +%if "%{with_gd}" == "yes"
  +        --with-gd=%{l_prefix} \
  +        --with-jpeg-dir=%{l_prefix} \
  +        --with-png-dir=%{l_prefix} \
  +%endif
  +%if "%{with_freetype}" == "yes"
  +        --enable-gd-imgstrttf \
  +        --enable-gd-native-ttf \
  +        --with-freetype-dir=%{l_prefix} \
  +%endif
  +%if "%{with_db}" == "yes"
  +        --with-db3=%{l_prefix} \
  +%endif
  +%if "%{with_debug}" == "yes"
  +        --with-debug=yes \
  +%else
  +        --with-debug=no \
  +%endif
  +%if "%{with_zlib}" == "yes"
  +        --with-zlib=%{l_prefix} \
  +        --with-zlib-dir=%{l_prefix} \
  +%endif
  +%if "%{with_bzip2}" == "yes"
  +        --with-bz2=%{l_prefix} \
  +%endif
  +%if "%{with_pdflib}" == "yes"
  +        --with-pdflib=%{l_prefix} \
  +        --with-jpeg-dir=%{l_prefix} \
  +        --with-png-dir=%{l_prefix} \
  +%endif
  +%if "%{with_openssl}" == "yes" || "%{with_openldap}" == "yes"
  +        --with-openssl=%{l_prefix} \
  +%endif
  +%if "%{with_openldap}" == "yes"
  +        --with-ldap=%{l_prefix} \
  +%endif
  +%if "%{with_mm}" == "yes"
  +        --with-mm=%{l_prefix} \
  +        --enable-session \
  +%endif
  +%if "%{with_pcre}" == "yes"
  +        --with-pcre=%{l_prefix} \
  +%endif
  +%if "%{with_ftp}" == "yes"
  +        --enable-ftp \
  +%endif
  +%if "%{with_java}" == "yes"
  +        --with-java=%{l_prefix}/libexec/j2se \
  +%endif
  +%if "%{with_oci7}" == "yes"
  +        --with-oracle \
  +%endif
  +%if "%{with_oci8}" == "yes"
  +        --with-oci8 \
  +%endif
  +%if "%{with_gettext}" == "yes"
  +        --with-gettext=%{l_prefix} \
  +%endif
  +%if "%{with_imap}" == "yes"
  +        --with-imap=%{l_prefix} \
  +        --with-imap-ssl=%{l_prefix} \
  +%endif
  +%if "%{with_xml}" == "yes"
  +        --with-xml=%{l_prefix} \
  +%endif
  +%if "%{with_dom}" == "yes"
  +        --with-dom=%{l_prefix} \
  +        --with-dom-xslt=%{l_prefix} \
  +        --with-dom-exslt=%{l_prefix} \
  +%endif
  +%if "%{with_dom}" == "yes"
  +        --enable-wddx \
  +%endif
  +%if "%{with_bc}" == "yes"
  +        --enable-bcmath \
  +%endif
  +%if "%{with_transsid}" == "yes"
  +        --enable-trans-sid \
  +%endif
  +%if "%{with_mhash}" == "yes"
  +        --with-mhash=%{l_prefix} \
  +%endif
  +%if "%{with_curl}" == "yes"
  +        --with-curl=%{l_prefix} \
  +%endif
  +%if "%{with_gdbm}" == "yes"
  +        --with-gdbm=%{l_prefix} \
  +%endif
  +%if "%{with_versioning}" == "yes"
  +        --enable-versioning \
  +%endif
  +        --enable-cli \
           --enable-force-cgi-redirect \
           --enable-discard-path \
           --enable-track-vars
  @@ -71,12 +280,23 @@
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/cgi \
  -        $RPM_BUILD_ROOT%{l_prefix}/etc/php
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/php \
  +        $RPM_BUILD_ROOT%{l_prefix}/include/php/regex
       %{l_shtool} install -c -s -m 755 sapi/cli/php $RPM_BUILD_ROOT%{l_prefix}/cgi/
       ln $RPM_BUILD_ROOT%{l_prefix}/cgi/php \
          $RPM_BUILD_ROOT%{l_prefix}/bin/php
       %{l_shtool} install -c -m 644 /dev/null \
           $RPM_BUILD_ROOT%{l_prefix}/etc/php/php.ini
  +    %{l_shtool} install -c -m 644 /dev/null \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/php/php.ini
  +    %{l_shtool} install -c -m 644 \
  +        *.h \
  +        include/*.h \
  +        main/*.h \
  +        Zend/*.h \
  +        TSRM/*.h \
  +        regex/*.h \
  +        $RPM_BUILD_ROOT%{l_prefix}/include/php
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
           '%config %{l_prefix}/etc/php/php.ini'
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3374 -r1.3375 news.txt
  --- openpkg-web/news.txt      20 Feb 2003 09:30:40 -0000      1.3374
  +++ openpkg-web/news.txt      20 Feb 2003 09:33:31 -0000      1.3375
  @@ -1,3 +1,4 @@
  +20-Feb-2003: Upgraded package: P<php-4.3.1-20030220>
   20-Feb-2003: Upgraded package: P<uvscan-4.1.6.4248-20030220>
   20-Feb-2003: Upgraded package: P<sitecopy-0.12.1-20030220>
   20-Feb-2003: Upgraded package: P<openpkg-tool-20030220-20030220>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to