diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-php/PEAR-PEAR/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-php/PEAR-PEAR/files')
-rw-r--r-- | dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch | 15 | ||||
-rw-r--r-- | dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix.patch | 31 | ||||
-rw-r--r-- | dev-php/PEAR-PEAR/files/pear.conf-r2 | 2 |
3 files changed, 48 insertions, 0 deletions
diff --git a/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch new file mode 100644 index 000000000000..f9a894100c8b --- /dev/null +++ b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch @@ -0,0 +1,15 @@ +diff -aruN PEAR.orig/Builder.php PEAR/Builder.php +--- a/PEAR/Builder.php 2014-07-12 08:25:32.000000000 -0400 ++++ b/PEAR/Builder.php 2015-01-16 13:43:14.927894013 -0500 +@@ -340,6 +340,11 @@ + } + // }}} end of interactive part + ++ if (file_exists('aclocal.m4')) { ++ $this->_runCommand('rm aclocal.m4'); ++ $this->_runCommand('autoreconf'); ++ } ++ + // FIXME make configurable + if (!$user=getenv('USER')) { + $user='defaultuser'; diff --git a/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix.patch b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix.patch new file mode 100644 index 000000000000..53a33b833f7d --- /dev/null +++ b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix.patch @@ -0,0 +1,31 @@ +Fixed libtool mismatch issues. +Gentoo bug: 344605 + +*** PEAR/Builder.php.old Mon Nov 8 16:22:52 2010 +--- PEAR/Builder.php Mon Nov 8 16:20:22 2010 +*************** +*** 326,331 **** +--- 326,336 ---- + } + // }}} end of interactive part + ++ if (file_exists('aclocal.m4')) { ++ $this->_runCommand('rm aclocal.m4'); ++ $this->_runCommand('autoreconf'); ++ } ++ + // FIXME make configurable + if(!$user=getenv('USER')){ + $user='defaultuser'; +*************** +*** 471,474 **** + } + return PEAR_Common::log($level, $msg); + } +! } +\ No newline at end of file +--- 476,479 ---- + } + return PEAR_Common::log($level, $msg); + } +! } diff --git a/dev-php/PEAR-PEAR/files/pear.conf-r2 b/dev-php/PEAR-PEAR/files/pear.conf-r2 new file mode 100644 index 000000000000..277227b4a47b --- /dev/null +++ b/dev-php/PEAR-PEAR/files/pear.conf-r2 @@ -0,0 +1,2 @@ +#PEAR_Config 0.9 +a:9:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:12:"/usr/bin/php";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";s:12:"download_dir";s:DOWNLOADDIRLEN:"DOWNLOADDIR";s:8:"temp_dir";s:TEMPDIRLEN:"TEMPDIR";} |