cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- shrink and drop a patch by using a pre-configure target instead.

Browse Source
This commit is contained in:
jasper 2011-11-02 17:51:32 +00:00
parent bde772d129
commit 9d122b03ba
4 changed files with 21 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devel/giggle/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2011/10/24 17:56:16 jasper Exp $
# $OpenBSD: Makefile,v 1.23 2011/11/02 17:51:32 jasper Exp $
COMMENT= gtk-based git repository viewer
@ -45,4 +45,13 @@ CONFIGURE_ARGS+=--disable-terminal
SUBST_VARS+= GNOME_VERSION
# Remove a few compiler options GCC 4.2.1 doesn't understand.
pre-configure:
perl -pi -e 's,-Wclobbered,,g;' \
-e 's,-Wempty-body,,g;' \
-e 's,-Wignored-qualifiers,,g;' \
-e 's,-Wtype-limits,,g;' \
-e 's,-Wmissing-parameter-type,,g' \
${WRKSRC}/configure
.include <bsd.port.mk>

30
devel/giggle/patches/patch-configure
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2011/10/24 17:56:16 jasper Exp $
Remove a few compiler options GCC 4.2.1 doesn't understand.
--- configure.orig Mon Oct 24 15:04:42 2011
+++ configure Mon Oct 24 19:48:06 2011
@@ -15867,18 +15867,18 @@ if test "$GCC" = "yes"; then
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wformat-security"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-include-dirs"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-format-attribute"
- WARNINGFLAGS_C="$WARNINGFLAGS_C -Wclobbered"
- WARNINGFLAGS_C="$WARNINGFLAGS_C -Wempty-body"
- WARNINGFLAGS_C="$WARNINGFLAGS_C -Wignored-qualifiers"
+# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wclobbered"
+# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wempty-body"
+# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wignored-qualifiers"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wsign-compare"
- WARNINGFLAGS_C="$WARNINGFLAGS_C -Wtype-limits"
+# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wtype-limits"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wuninitialized"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Waggregate-return"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wdeclaration-after-statement"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wshadow"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wno-strict-aliasing"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Winline"
- WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-parameter-type"
+# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-parameter-type"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Woverride-init"
else
WARNINGFLAGS_C=""

11
x11/gnome/power-manager/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2011/10/17 11:24:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.16 2011/11/02 17:51:32 jasper Exp $
COMMENT= GNOME power manager
@ -39,4 +39,13 @@ MODGNOME_LDFLAGS= -L${X11BASE}/lib
CONFIGURE_ENV= ac_cv_path_DOCBOOK2MAN=no \
ac_cv_path_XMLTO=no
# Remove a few compiler options GCC 4.2.1 doesn't understand.
pre-configure:
perl -pi -e 's,-Wclobbered,,g;' \
-e 's,-Wempty-body,,g;' \
-e 's,-Wignored-qualifiers,,g;' \
-e 's,-Wtype-limits,,g;' \
-e 's,-Wmissing-parameter-type,,g' \
${WRKSRC}/configure
.include <bsd.port.mk>

22
x11/gnome/power-manager/patches/patch-configure_ac
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_ac,v 1.2 2011/10/17 08:26:07 jasper Exp $
$OpenBSD: patch-configure_ac,v 1.3 2011/11/02 17:51:32 jasper Exp $
From dde008e64a81ec90a8c32ebc16763321648d889a Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
@ -15,23 +15,3 @@ Subject: Remove check for gnome-doc-utils as there are no docs anymore to build.
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
@@ -56,14 +55,14 @@ if test "$GCC" = "yes"; then
WARNINGFLAGS="$WARNINGFLAGS -Wformat-security"
WARNINGFLAGS="$WARNINGFLAGS -Wmissing-include-dirs"
WARNINGFLAGS="$WARNINGFLAGS -Wmissing-format-attribute"
- WARNINGFLAGS="$WARNINGFLAGS -Wclobbered"
- WARNINGFLAGS="$WARNINGFLAGS -Wempty-body"
- WARNINGFLAGS="$WARNINGFLAGS -Wignored-qualifiers"
- WARNINGFLAGS="$WARNINGFLAGS -Wtype-limits"
+# WARNINGFLAGS="$WARNINGFLAGS -Wclobbered"
+# WARNINGFLAGS="$WARNINGFLAGS -Wempty-body"
+# WARNINGFLAGS="$WARNINGFLAGS -Wignored-qualifiers"
+# WARNINGFLAGS="$WARNINGFLAGS -Wtype-limits"
WARNINGFLAGS="$WARNINGFLAGS -Wdeclaration-after-statement"
WARNINGFLAGS="$WARNINGFLAGS -Wshadow"
WARNINGFLAGS="$WARNINGFLAGS -Winline"
- WARNINGFLAGS="$WARNINGFLAGS -Wmissing-parameter-type"
+# WARNINGFLAGS="$WARNINGFLAGS -Wmissing-parameter-type"
WARNINGFLAGS="$WARNINGFLAGS -Woverride-init"
WARNINGFLAGS="$WARNINGFLAGS -Wno-strict-aliasing"
else