Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/php-5_2/php-sapi/patches-other/pear_Builder_php.patch
author Huie-Ying Lee <huieying.lee@oracle.com>
Mon, 04 Jun 2012 11:26:13 -0700
changeset 850 66e4d7e438bd
parent 461 edabdd6aff23
permissions -rw-r--r--
7169875 Problem with crypto/openssl
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
461
edabdd6aff23 7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     1
 
--- PEAR/Builder.php.ORIG	Tue Jun 30 16:44:29 2009
edabdd6aff23 7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     2
 
+++ PEAR/Builder.php	Tue Jun 30 16:44:37 2009
edabdd6aff23 7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     3
 
@@ -379,7 +379,7 @@
edabdd6aff23 7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     4
 
         $built_files = array();
edabdd6aff23 7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     5
 
         $prefix = exec($this->config->get('php_prefix')
edabdd6aff23 7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     6
 
                         . "php-config" .
edabdd6aff23 7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     7
 
-                       $this->config->get('php_suffix') . " --prefix");
edabdd6aff23 7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     8
 
+                       $this->config->get('php_suffix') . " --pear-prefix");
edabdd6aff23 7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     9
 
         $this->_harvestInstDir($prefix, $inst_dir . DIRECTORY_SEPARATOR . $prefix, $built_files);
edabdd6aff23 7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    10
 
         chdir($old_cwd);
edabdd6aff23 7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    11
 
         return $built_files;
upstream/oracle/userland-gate