Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 69704 Details for
Bug 105760
sci-libs/gdal appeas to have RPATH issues
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
path against gdal ebuilds
gdal.diff (text/plain), 5.62 KB, created by
Daniel Black (RETIRED)
on 2005-10-02 04:18:58 UTC
(
hide
)
Description:
path against gdal ebuilds
Filename:
MIME Type:
Creator:
Daniel Black (RETIRED)
Created:
2005-10-02 04:18:58 UTC
Size:
5.62 KB
patch
obsolete
>diff -u -b -B -r1.5 gdal-1.2.6-r3.ebuild >--- gdal-1.2.6-r3.ebuild 21 Sep 2005 06:19:14 -0000 1.5 >+++ gdal-1.2.6-r3.ebuild 2 Oct 2005 11:14:14 -0000 >@@ -44,6 +44,7 @@ > > src_unpack() { > unpack ${A} >+ epatch ${FILESDIR}/${P}-installpathfix.patch > cd ${S} > elibtoolize --patch-only > gnuconfig_update >@@ -53,7 +54,7 @@ > einfo "Found HDF4 compiled with szip. Nice." > else > ewarn "HDF4 must be compiled with szip USE flag!" >- einfo "Emerge HDF with szip USE flag and then emerge GDAL." >+ einfo "Emerge HDF (sci-libs/hdf) with szip USE flag and then emerge GDAL." > die "HDF4 not merged with szip use flag" > fi > fi >@@ -61,16 +62,6 @@ > > src_compile() { > distutils_python_version >- # This package uses old borked automake/autoconf and libtool, so >- # it doesn't work without ${D} (or with econf and einstall). >- >- pkg_conf="--prefix=${D}usr --exec-prefix=${D}usr --bindir=${D}usr/bin \ >- --datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal \ >- --libdir=${D}usr/$(get_libdir) --mandir=${D}usr/share/man \ >- --with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \ >- --enable-static=no --enable-shared=yes --with-gnu-ld" >- >- # the above should make libtool behave for the most part > > use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \ > $(use_with postgres pg) $(use_with fits cfitsio) \ >@@ -100,22 +91,16 @@ > fi > > if useq python ; then >- use_conf="--with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \ >+ use_conf="--with-pymoddir=/usr/lib/python${PYVER}/site-packages \ > ${use_conf}" > else > use_conf="--with-python=no ${use_conf}" > fi > > # Fix doc path just in case >- sed -i -e "s:@exec_prefix@/doc:${D}usr/share/doc/${PF}/html:g" GDALmake.opt.in >- >- ./configure --with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \ >- ${pkg_conf} ${use_conf} >+ sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in > >- # Patch libtool here since it's not created until after configure runs >- sed -i -e "s:hardcode_into_libs=yes:hardcode_into_libs=no:g" libtool >- echo '#undef GDAL_PREFIX' >> port/cpl_config.h >- echo '#define GDAL_PREFIX "/usr"' >> port/cpl_config.h >+ econf ${use_conf} || die 'configure failed' > emake || die "emake failed" > if useq doc ; then > emake docs || die "emake docs failed" >@@ -125,9 +110,6 @@ > src_install() { > # einstall causes sandbox violations on /usr/lib/libgdal.so > make DESTDIR=${D} install || die "make install failed" >- dosed "s:${D}usr:/usr:g" /usr/bin/gdal-config >- dosed "s:/usr/local/bin/perl:/usr/bin/perl:g" ${S}/Doxyfile.man >- dosed "s:$(INST_DOCS)/gdal:$(INST_DOCS)/html:g" GNUmakefile > dodoc Doxyfile.man Doxyfile HOWTO-RELEASE NEWS > if useq doc ; then > dohtml html/* || die "install html failed" >Index: gdal-1.3.0.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.0.ebuild,v >retrieving revision 1.2 >diff -u -b -B -r1.2 gdal-1.3.0.ebuild >--- gdal-1.3.0.ebuild 21 Sep 2005 06:19:14 -0000 1.2 >+++ gdal-1.3.0.ebuild 2 Oct 2005 11:14:14 -0000 >@@ -45,6 +45,7 @@ > > src_unpack() { > unpack ${A} >+ epatch ${FILESDIR}/${P}-installpathfix.patch > cd ${S} > elibtoolize --patch-only > gnuconfig_update >@@ -53,7 +54,7 @@ > if built_with_use sci-libs/hdf szip ; then > einfo "Found HDF4 compiled with szip. Nice." > else >- ewarn "HDF4 must be compiled with szip USE flag!" >+ ewarn "HDF4 (sci-libs/hdf) must be compiled with szip USE flag!" > einfo "Emerge HDF with szip USE flag and then emerge GDAL." > die "HDF4 not merged with szip use flag" > fi >@@ -62,16 +63,6 @@ > > src_compile() { > distutils_python_version >- # This package uses old borked automake/autoconf and libtool, so >- # it doesn't work without ${D} (or with econf and einstall). >- >- pkg_conf="--prefix=${D}usr --exec-prefix=${D}usr --bindir=${D}usr/bin \ >- --datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal \ >- --libdir=${D}usr/$(get_libdir) --mandir=${D}usr/share/man \ >- --with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \ >- --enable-static=no --enable-shared=yes --with-gnu-ld" >- >- # the above should make libtool behave for the most part > > use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \ > $(use_with postgres pg) $(use_with fits cfitsio) \ >@@ -101,22 +92,17 @@ > fi > > if useq python ; then >- use_conf="--with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \ >+ use_conf="--with-pymoddir=/usr/lib/python${PYVER}/site-packages \ > ${use_conf}" > else > use_conf="--with-python=no ${use_conf}" > fi > > # Fix doc path just in case >- sed -i -e "s:@exec_prefix@/doc:${D}usr/share/doc/${PF}/html:g" GDALmake.opt.in >+ sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in > >- ./configure --with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \ >- ${pkg_conf} ${use_conf} >+ econf ${use_conf} || die 'configure failed' > >- # Patch libtool here since it's not created until after configure runs >- sed -i -e "s:hardcode_into_libs=yes:hardcode_into_libs=no:g" libtool >- echo '#undef GDAL_PREFIX' >> port/cpl_config.h >- echo '#define GDAL_PREFIX "/usr"' >> port/cpl_config.h > emake || die "emake failed" > if useq doc ; then > emake docs || die "emake docs failed" >@@ -126,9 +112,6 @@ > src_install() { > # einstall causes sandbox violations on /usr/lib/libgdal.so > make DESTDIR=${D} install || die "make install failed" >- dosed "s:${D}usr:/usr:g" /usr/bin/gdal-config >- dosed "s:/usr/local/bin/perl:/usr/bin/perl:g" ${S}/Doxyfile.man >- dosed "s:$(INST_DOCS)/gdal:$(INST_DOCS)/html:g" GNUmakefile > dodoc Doxyfile.man Doxyfile HOWTO-RELEASE NEWS > if useq doc ; then > dohtml html/*.* || die "install html failed"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 105760
: 69704 |
69708
|
69709