summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-01-07 21:45:03 -0500
committerMike Frysinger <vapier@gentoo.org>2016-01-08 14:46:02 -0500
commit31c685e18c5b9b558b7deb85d8235f4e9007ac80 (patch)
tree139b7c0ecb45c80d16aec9e49b895d97964717d6 /app-text/ghostscript-gpl
parentnet-misc/dhcpcd: amd64 stable wrt bug #571152 (diff)
downloadgentoo-31c685e18c5b9b558b7deb85d8235f4e9007ac80.tar.gz
gentoo-31c685e18c5b9b558b7deb85d8235f4e9007ac80.tar.bz2
gentoo-31c685e18c5b9b558b7deb85d8235f4e9007ac80.zip
app-text/ghostscript-gpl: fix zlib include path usage
The ghostscript-gpl-9.12-sys-zlib.patch attempts to change the include path from the local copy in the src to the common includedir flag set by configure flags. This generally works for native builds, but breaks when cross-compiling. Drop the patch and set the zlib src dir to the temp dir instead.
Diffstat (limited to 'app-text/ghostscript-gpl')
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild8
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild14
2 files changed, 19 insertions, 3 deletions
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
index 46321ba50eb7..002dd92be082 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
@@ -89,6 +89,9 @@ src_prepare() {
# http://pkgs.fedoraproject.org/cgit/ghostscript.git
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
EPATCH_SOURCE="${WORKDIR}/patches/"
+ EPATCH_EXCLUDE="
+ ghostscript-gpl-9.12-sys-zlib.patch
+ "
epatch
if use djvu ; then
@@ -112,6 +115,11 @@ src_prepare() {
"${S}"/base/unix-dll.mak || die "sed failed"
fi
+ # Force the include dirs to a neutral location.
+ sed -i \
+ -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+ configure.ac || die
+
# search path fix
# put LDFLAGS after BINDIR, bug #383447
sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild
index 13e873ca3d53..2bd0afe9a505 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild
@@ -89,9 +89,12 @@ src_prepare() {
# http://pkgs.fedoraproject.org/cgit/ghostscript.git
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
EPATCH_SOURCE="${WORKDIR}/patches/"
- EPATCH_EXCLUDE="ghostscript-gpl-8.64-noopt.patch
- ghostscript-gpl-9.07-wrf-snprintf.patch
- ghostscript-gpl-9.12-icc-missing-check.patch"
+ EPATCH_EXCLUDE="
+ ghostscript-gpl-8.64-noopt.patch
+ ghostscript-gpl-9.07-wrf-snprintf.patch
+ ghostscript-gpl-9.12-icc-missing-check.patch
+ ghostscript-gpl-9.12-sys-zlib.patch
+ "
epatch
epatch "${FILESDIR}"/${P}-gserrors.h-backport.patch
@@ -117,6 +120,11 @@ src_prepare() {
"${S}"/base/unix-dll.mak || die "sed failed"
fi
+ # Force the include dirs to a neutral location.
+ sed -i \
+ -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+ configure.ac || die
+
# search path fix
# put LDFLAGS after BINDIR, bug #383447
sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \