summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2008-12-20 18:08:07 +0000
committergdt <gdt@pkgsrc.org>2008-12-20 18:08:07 +0000
commit02f5f7643a61737da2d5ba4ca83b58b411cca91a (patch)
tree8b9b473b865b70de45cc0d4b218e68b6bb6b3c87
parentb998383f6152f7a2503a0d76204163e16cc08005 (diff)
downloadpkgsrc-02f5f7643a61737da2d5ba4ca83b58b411cca91a.tar.gz
Don't use -O6 and -O3 because some gcc versions choke.
From Bernd Ernesti in private mail.
-rw-r--r--print/gutenprint-lib/Makefile4
-rw-r--r--print/gutenprint-lib/distinfo3
-rw-r--r--print/gutenprint-lib/patches/patch-ab22
3 files changed, 26 insertions, 3 deletions
diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index 1cdb4d88073..197ea39df6e 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2008/12/20 15:57:02 gdt Exp $
+# $NetBSD: Makefile,v 1.10 2008/12/20 18:08:07 gdt Exp $
VERSION= 5.2.2
DISTNAME= gutenprint-${VERSION}
EXTRACT_SUFX= .tar.bz2
PKGNAME= gutenprint-lib-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
diff --git a/print/gutenprint-lib/distinfo b/print/gutenprint-lib/distinfo
index 458fc363a8e..d3b5aa6dc93 100644
--- a/print/gutenprint-lib/distinfo
+++ b/print/gutenprint-lib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/12/20 00:54:17 gdt Exp $
+$NetBSD: distinfo,v 1.3 2008/12/20 18:08:07 gdt Exp $
SHA1 (gutenprint-5.2.2.tar.bz2) = 0efaadf2db4c67ecb66e79f5405315975dd1d11b
RMD160 (gutenprint-5.2.2.tar.bz2) = eac1ce4304f044e9aadfc4081c0408f038f685bd
Size (gutenprint-5.2.2.tar.bz2) = 4913895 bytes
SHA1 (patch-aa) = b085bcf736d230c7f05d7b27bd1831165f958579
+SHA1 (patch-ab) = aa773c2c0789995df28b5533bf8b93cec8be6ec8
diff --git a/print/gutenprint-lib/patches/patch-ab b/print/gutenprint-lib/patches/patch-ab
new file mode 100644
index 00000000000..7b6ee6f6d62
--- /dev/null
+++ b/print/gutenprint-lib/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2008/12/20 18:08:07 gdt Exp $
+
+--- ./configure.orig 2008-11-14 13:49:21.000000000 +0100
++++ ./configure 2008-12-19 21:23:35.000000000 +0100
+@@ -26682,7 +26682,7 @@
+
+ else
+
+- for stp_ac_arg in -O6 -O3 -O2 -O1 -O ; do
++ for stp_ac_arg in -O2 -O1 -O ; do
+ stp_ac_save_CFLAGS="${CFLAGS}"
+
+ { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+@@ -31879,6 +31879,8 @@
+ case $ac_option in
+ # Handling of the options.
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++ : Avoid regenerating within pkgsrc
++ exit 0
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ echo "$ac_cs_version"; exit ;;