diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2011-11-06 16:36:34 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2011-11-06 16:36:34 +0000 |
commit | e8f615fbc715f42707a29c7edb35e44d385cf208 (patch) | |
tree | f3d03c9a8d450e1086285595fa1bf043f7497bf6 /audio/murmur | |
parent | d79546650036a31ea6a476b307e54f0c4f692f31 (diff) | |
download | ports-e8f615fbc715f42707a29c7edb35e44d385cf208.tar.gz ports-e8f615fbc715f42707a29c7edb35e44d385cf208.zip |
Notes
Diffstat (limited to 'audio/murmur')
-rw-r--r-- | audio/murmur/Makefile | 3 | ||||
-rw-r--r-- | audio/murmur/files/freebsd6-patch-compiler.pri | 24 |
2 files changed, 0 insertions, 27 deletions
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile index 233c2683dc9a..254821bb5d60 100644 --- a/audio/murmur/Makefile +++ b/audio/murmur/Makefile @@ -53,9 +53,6 @@ CONFIG+= no-bonjour .endif post-patch: -.if ${OSVERSION} < 700000 - @cd ${WRKSRC} && ${PATCH} -sp < ${PATCHDIR}/freebsd6-patch-compiler.pri -.endif .if ${OSVERSION} >= 800000 @${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro .endif diff --git a/audio/murmur/files/freebsd6-patch-compiler.pri b/audio/murmur/files/freebsd6-patch-compiler.pri deleted file mode 100644 index a453045200da..000000000000 --- a/audio/murmur/files/freebsd6-patch-compiler.pri +++ /dev/null @@ -1,24 +0,0 @@ ---- compiler.pri.orig 2009-12-10 21:05:44.000000000 +0300 -+++ compiler.pri 2009-12-23 03:50:17.000000000 +0300 -@@ -68,8 +68,8 @@ - - unix { - DEFINES *= RESTRICT=__restrict__ -- QMAKE_CFLAGS *= -Wfatal-errors -Wshadow -Wconversion -Wsign-compare -fvisibility=hidden -- QMAKE_CXXFLAGS *= -Wfatal-errors -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare -fvisibility=hidden -+ QMAKE_CFLAGS *= -Wshadow -Wconversion -Wsign-compare -+ QMAKE_CXXFLAGS *= -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare - - CONFIG(opt-gcc) { - QMAKE_CC = /opt/gcc/bin/gcc -@@ -91,8 +91,8 @@ - - unix:!macx { - CONFIG(debug, debug|release) { -- QMAKE_CFLAGS *= -fstack-protector -fPIE -pie -- QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie -+ QMAKE_CFLAGS *= -fPIE -pie -+ QMAKE_CXXFLAGS *= -fPIE -pie - QMAKE_LFLAGS = -Wl - } - |