From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 10B9F1388BF for ; Fri, 8 Jan 2016 19:59:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7BA9E0856; Fri, 8 Jan 2016 19:59:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB673E084C for ; Fri, 8 Jan 2016 19:59:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7006334092D for ; Fri, 8 Jan 2016 19:59:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3B9EC79 for ; Fri, 8 Jan 2016 19:59:30 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1452282362.31c685e18c5b9b558b7deb85d8235f4e9007ac80.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/ghostscript-gpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild X-VCS-Directories: app-text/ghostscript-gpl/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 31c685e18c5b9b558b7deb85d8235f4e9007ac80 X-VCS-Branch: master Date: Fri, 8 Jan 2016 19:59:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bc1250ed-0a35-45fd-b5ee-c7c86e952a26 X-Archives-Hash: 61a237076a90ec334ebd7d036a536fdf commit: 31c685e18c5b9b558b7deb85d8235f4e9007ac80 Author: Mike Frysinger gentoo org> AuthorDate: Fri Jan 8 02:45:03 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Jan 8 19:46:02 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31c685e1 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. app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild | 8 ++++++++ app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild | 14 +++++++++++--- 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 46321ba..002dd92 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 13e873c..2bd0afe 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):" \