| 1 |
scarabeus 11/05/02 21:51:23 |
| 2 |
|
| 3 |
Modified: ChangeLog mapserver-6.0.0_rc1.ebuild |
| 4 |
Log: |
| 5 |
Make php extension really work. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.38 sci-geosciences/mapserver/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.38&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.38&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?r1=1.37&r2=1.38 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v |
| 19 |
retrieving revision 1.37 |
| 20 |
retrieving revision 1.38 |
| 21 |
diff -u -r1.37 -r1.38 |
| 22 |
--- ChangeLog 2 May 2011 20:09:56 -0000 1.37 |
| 23 |
+++ ChangeLog 2 May 2011 21:51:22 -0000 1.38 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for sci-geosciences/mapserver |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.37 2011/05/02 20:09:56 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.38 2011/05/02 21:51:22 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 02 May 2011; Tomáš Chvátal <scarabeus@g.o> |
| 31 |
+ +files/6.0.0_rc1-php_ldflags.patch, mapserver-6.0.0_rc1.ebuild: |
| 32 |
+ Make php extension really work. |
| 33 |
|
| 34 |
02 May 2011; Tomáš Chvátal <scarabeus@g.o> |
| 35 |
mapserver-6.0.0_rc1.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.11 sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild?rev=1.11&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild?rev=1.11&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild?r1=1.10&r2=1.11 |
| 44 |
|
| 45 |
Index: mapserver-6.0.0_rc1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v |
| 48 |
retrieving revision 1.10 |
| 49 |
retrieving revision 1.11 |
| 50 |
diff -u -r1.10 -r1.11 |
| 51 |
--- mapserver-6.0.0_rc1.ebuild 2 May 2011 20:09:56 -0000 1.10 |
| 52 |
+++ mapserver-6.0.0_rc1.ebuild 2 May 2011 21:51:22 -0000 1.11 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v 1.10 2011/05/02 20:09:56 scarabeus Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v 1.11 2011/05/02 21:51:22 scarabeus Exp $ |
| 58 |
|
| 59 |
EAPI=3 |
| 60 |
|
| 61 |
@@ -87,6 +87,16 @@ |
| 62 |
|
| 63 |
each_ruby_configure() { ${RUBY} extconf.rb || die ; } |
| 64 |
|
| 65 |
+ext-source-r2_src_install() { |
| 66 |
+ local slot |
| 67 |
+ for slot in $(php_get_slots); do |
| 68 |
+ php_init_slot_env ${slot} |
| 69 |
+ insinto "${EXT_DIR}" |
| 70 |
+ newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension" |
| 71 |
+ done |
| 72 |
+ php-ext-source-r2_createinifiles |
| 73 |
+} |
| 74 |
+ |
| 75 |
pkg_setup() { |
| 76 |
webapp_pkg_setup |
| 77 |
use perl && perl-module_pkg_setup |
| 78 |
@@ -97,11 +107,17 @@ |
| 79 |
src_unpack() { |
| 80 |
# unpack A and then copy the php thingies into workdir/php-slot |
| 81 |
php-ext-source-r2_src_unpack |
| 82 |
+ # HACK: and then remove it and replace by symlink |
| 83 |
+ for slot in $(php_get_slots); do |
| 84 |
+ rm -rf "${WORKDIR}/${slot}" || die |
| 85 |
+ ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die |
| 86 |
+ done |
| 87 |
} |
| 88 |
|
| 89 |
src_prepare() { |
| 90 |
epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \ |
| 91 |
- "${FILESDIR}/6.0.0_rc1-bool.patch" |
| 92 |
+ "${FILESDIR}/6.0.0_rc1-bool.patch" \ |
| 93 |
+ "${FILESDIR}/6.0.0_rc1-php_ldflags.patch" |
| 94 |
eautoreconf |
| 95 |
} |
| 96 |
|
| 97 |
@@ -158,11 +174,11 @@ |
| 98 |
} |
| 99 |
|
| 100 |
src_compile() { |
| 101 |
- emake -j1 || die |
| 102 |
+ emake || die |
| 103 |
use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_compile" |
| 104 |
use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep" |
| 105 |
use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile" |
| 106 |
- use php && php-ext-source-r2_src_compile |
| 107 |
+ #use php && php-ext-source-r2_src_compile # already compiled by the emake all |
| 108 |
#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile" |
| 109 |
} |
| 110 |
|
| 111 |
@@ -184,7 +200,7 @@ |
| 112 |
use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_install" |
| 113 |
use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install" |
| 114 |
use perl && _enter_build_dir "${S}/mapscript/perl" "fixlocalpod" |
| 115 |
- use php && php-ext-source-r2_src_install |
| 116 |
+ use php && ext-source-r2_src_install |
| 117 |
#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install" |
| 118 |
|
| 119 |
webapp_src_preinst |
Archives