summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgdt <gdt>2015-09-26 12:15:28 +0000
committergdt <gdt>2015-09-26 12:15:28 +0000
commit68cd7255ae05f96219feed577f2c7af113d51091 (patch)
tree778de5ab4f6038761c9bdb278e47481b0c6c5e02
parentbfc3cd0e4e4622f145c42c4d80be879dce48bd52 (diff)
downloadpkgsrc-68cd7255ae05f96219feed577f2c7af113d51091.tar.gz
Disable -Werror to avoid build failures.
At least on OS X with clang, pkgin fails to build because of extra parens around ==. See https://github.com/NetBSDfr/pkgin/issues/64 for details. This seems to be a new issue with something in the pkgsrc build environment (bsd makefiles or compat libs), not in pkgin proper, but pkgin's use of bsd makefiles leads to Werror.
-rw-r--r--pkgtools/pkgin/Makefile3
-rw-r--r--pkgtools/pkgin/distinfo3
-rw-r--r--pkgtools/pkgin/patches/patch-Makefile.in20
3 files changed, 24 insertions, 2 deletions
diff --git a/pkgtools/pkgin/Makefile b/pkgtools/pkgin/Makefile
index b47b0ee250a..4b543b60984 100644
--- a/pkgtools/pkgin/Makefile
+++ b/pkgtools/pkgin/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2015/09/04 19:37:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.61 2015/09/26 12:15:28 gdt Exp $
GHCOMMIT= b08581b094980b6fc32beb304b8d3dda0689cc82
DISTNAME= ${GHCOMMIT}
PKGNAME= pkgin-0.9.3
+PKGREVISION= 1
CATEGORIES= pkgtools
MASTER_SITES= ${MASTER_SITE_GITHUB:=NetBSDfr/pkgin/archive/}
diff --git a/pkgtools/pkgin/distinfo b/pkgtools/pkgin/distinfo
index 787077eec2e..120c37ad69d 100644
--- a/pkgtools/pkgin/distinfo
+++ b/pkgtools/pkgin/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.40 2015/08/18 19:31:29 jperkin Exp $
+$NetBSD: distinfo,v 1.41 2015/09/26 12:15:28 gdt Exp $
SHA1 (b08581b094980b6fc32beb304b8d3dda0689cc82.tar.gz) = f9bdb53a6e404b83a8c5d4f7e54ceb3d1de8c786
RMD160 (b08581b094980b6fc32beb304b8d3dda0689cc82.tar.gz) = 42f2903fd180cb6ef43f331cdbaf530ba8f479b9
Size (b08581b094980b6fc32beb304b8d3dda0689cc82.tar.gz) = 198425 bytes
+SHA1 (patch-Makefile.in) = cdc5eaae5b2b441500c6cad2953589515132dcfb
diff --git a/pkgtools/pkgin/patches/patch-Makefile.in b/pkgtools/pkgin/patches/patch-Makefile.in
new file mode 100644
index 00000000000..3079e722c71
--- /dev/null
+++ b/pkgtools/pkgin/patches/patch-Makefile.in
@@ -0,0 +1,20 @@
+$NetBSD: patch-Makefile.in,v 1.5 2015/09/26 12:15:28 gdt Exp $
+
+pkgin has code with spurious parens, which leads clang to fail when
+given -Werror. Because the code is not warning-clean, disable -Werror
+for now.
+
+Filed upstream as https://github.com/NetBSDfr/pkgin/issues/64.
+
+--- Makefile.in.orig 2015-08-18 19:19:55.000000000 +0000
++++ Makefile.in
+@@ -19,6 +19,9 @@ DPSRCS= pkgindb_create.h
+ CC= @CC@
+ INSTALL= @INSTALL@
+
++# pkgin sources have extra parens on equality, which breaks under clang on OSX
++NOGCCERROR= true
++
+ OPSYS!= uname
+ OS_VER!= uname -r
+ OS_ARCH!= uname -p