summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2002-11-26 15:04:03 +0000
committerMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2002-11-26 15:04:03 +0000
commit4ea37d8368c8f6242c2c7ab8d35ed5e69361d507 (patch)
treed23ee921ed34405f8adfd7771836fb3e93e5fda2
parentUpdate to 2.2.2, which fixes showstopper protocol bugs. (diff)
Fix: insure CFLAG safeness
PR: 45688 Submitted by: Conrad Sabatier <conrads@cox.net>
Notes
Notes: svn path=/head/; revision=71119
-rw-r--r--graphics/ogle/Makefile5
-rw-r--r--multimedia/ogle/Makefile5
2 files changed, 8 insertions, 2 deletions
diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile
index 6b97796ba0d6..6ad5eaa492ba 100644
--- a/graphics/ogle/Makefile
+++ b/graphics/ogle/Makefile
@@ -39,7 +39,10 @@ post-patch:
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
.endif
@${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|" ${WRKSRC}/scripts/ogle.in
- @${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|' \
+# hack to make ogle work with liba52 + djbfft
+# CFLAGS safeness
+ @${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|; \
+ s,(X?CFLAGS[[:space:]]*=[[:space:]]*"\$$CFLAGS).*(-(fomit-frame-pointer|funroll-loops|march|mcpu)).*",\1",' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
pre-configure:
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 6b97796ba0d6..6ad5eaa492ba 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -39,7 +39,10 @@ post-patch:
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
.endif
@${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|" ${WRKSRC}/scripts/ogle.in
- @${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|' \
+# hack to make ogle work with liba52 + djbfft
+# CFLAGS safeness
+ @${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|; \
+ s,(X?CFLAGS[[:space:]]*=[[:space:]]*"\$$CFLAGS).*(-(fomit-frame-pointer|funroll-loops|march|mcpu)).*",\1",' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
pre-configure: