summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2013-11-03 16:41:35 +0000
committerJuergen Lock <nox@FreeBSD.org>2013-11-03 16:41:35 +0000
commit56d4c68624cd205ea6525ffbf195c79b52192d0d (patch)
treea3f708e29ef1326870177b36c37d9c62c8931c21
parentSend Devise's emails in background. Supports Resque, Sidekiq, Delayed::Job and (diff)
(Attempt to) fix build with gcc46 on i386.
Submitted by: beefy1 via pkg-fallout
Notes
Notes: svn path=/head/; revision=332625
-rw-r--r--emulators/kqemu-kmod-devel/Makefile1
-rw-r--r--emulators/kqemu-kmod-devel/files/patch-Makefile.freebsd9
-rw-r--r--emulators/kqemu-kmod/Makefile1
-rw-r--r--emulators/kqemu-kmod/files/patch-Makefile.freebsd9
4 files changed, 18 insertions, 2 deletions
diff --git a/emulators/kqemu-kmod-devel/Makefile b/emulators/kqemu-kmod-devel/Makefile
index 798242e697e6..644aaabba13c 100644
--- a/emulators/kqemu-kmod-devel/Makefile
+++ b/emulators/kqemu-kmod-devel/Makefile
@@ -44,7 +44,6 @@ PLIST_FILES+= "@cwd"
MAKEFILE= Makefile.freebsd
MAKE_ARGS+= LDFLAGS=${LDFLAGS:S/^-Wl,//}
-MAKE_ARGS+= CWARNFLAGS=-Wall
.if ${ARCH} == "amd64"
GMAKE_ARGS+= ARCH=x86_64
diff --git a/emulators/kqemu-kmod-devel/files/patch-Makefile.freebsd b/emulators/kqemu-kmod-devel/files/patch-Makefile.freebsd
new file mode 100644
index 000000000000..1dd6108aefbb
--- /dev/null
+++ b/emulators/kqemu-kmod-devel/files/patch-Makefile.freebsd
@@ -0,0 +1,9 @@
+--- Makefile.freebsd.orig
++++ Makefile.freebsd
+@@ -8,3 +8,6 @@ OBJS= kqemu-mod-x86_64.o
+ WERROR=
+
+ .include <bsd.kmod.mk>
++
++CFLAGS:= ${CFLAGS:N-fformat-extensions}
++CFLAGS:= ${CFLAGS:N-mno-align-long-strings}
diff --git a/emulators/kqemu-kmod/Makefile b/emulators/kqemu-kmod/Makefile
index 1de6dd814f34..2d0d0261e1ea 100644
--- a/emulators/kqemu-kmod/Makefile
+++ b/emulators/kqemu-kmod/Makefile
@@ -44,7 +44,6 @@ PLIST_FILES+= "@cwd"
MAKEFILE= Makefile.freebsd
MAKE_ARGS+= LDFLAGS=${LDFLAGS:S/^-Wl,//}
-MAKE_ARGS+= CWARNFLAGS=-Wall
.if ${ARCH} == "amd64"
GMAKE_ARGS+= ARCH=x86_64
diff --git a/emulators/kqemu-kmod/files/patch-Makefile.freebsd b/emulators/kqemu-kmod/files/patch-Makefile.freebsd
new file mode 100644
index 000000000000..1dd6108aefbb
--- /dev/null
+++ b/emulators/kqemu-kmod/files/patch-Makefile.freebsd
@@ -0,0 +1,9 @@
+--- Makefile.freebsd.orig
++++ Makefile.freebsd
+@@ -8,3 +8,6 @@ OBJS= kqemu-mod-x86_64.o
+ WERROR=
+
+ .include <bsd.kmod.mk>
++
++CFLAGS:= ${CFLAGS:N-fformat-extensions}
++CFLAGS:= ${CFLAGS:N-mno-align-long-strings}