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

Respect CFLAGS throughout the whole build.

Browse Source 
ok sthen@
This commit is contained in:
brad 2013-11-04 21:49:48 +00:00
parent 24cdb1a674
commit 6b05ded9ac
6 changed files with 68 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/silc-toolkit/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.34 2013/11/03 07:52:02 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.35 2013/11/04 21:49:48 brad Exp $
COMMENT= toolkit for the development of SILC applications
DISTNAME= silc-toolkit-1.1.10
REVISION = 4
REVISION = 5
CATEGORIES= devel
MASTER_SITES= http://www.silcnet.org/download/toolkit/sources/

21
devel/silc-toolkit/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.5 2013/11/03 07:52:02 ajacoutot Exp $
$OpenBSD: patch-configure_ac,v 1.6 2013/11/04 21:49:48 brad Exp $
--- configure.ac.orig Fri Aug 7 07:51:30 2009
+++ configure.ac Tue Aug 11 14:46:10 2009
+++ configure.ac Sun Nov 3 21:03:11 2013
@@ -97,9 +97,6 @@ AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue)
AM_CONDITIONAL(SILC_POWERPC, test x$cpu_ppc = xtrue)
AM_CONDITIONAL(SILC_IA64, test x$cpu_ia64 = xtrue)
@ -73,3 +73,20 @@ $OpenBSD: patch-configure_ac,v 1.5 2013/11/03 07:52:02 ajacoutot Exp $
#
# Workaround a bug in GCC 2.x which causes memory exhaustion
# when compiling sha1 with optimizations on UltraSPARC.
@@ -1294,7 +1241,7 @@ fi
SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fno-regmove)
if test x$summary_debug = xno -a x$want_cc_optimizations = xtrue; then
- SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fomit-frame-pointer -O3)
+ SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fomit-frame-pointer)
fi
AC_SUBST(SILC_CRYPTO_CFLAGS)
@@ -1330,7 +1277,6 @@ if test x$compile_libs = xtrue; then
AC_MSG_NOTICE([configuring math library])
if test x$want_cc_optimizations = xtrue; then
- SILC_ADD_CC_FLAGS(MATH, -O3, SILC_ADD_CC_FLAGS(MATH, -O2))
SILC_ADD_CC_FLAGS(MATH, -funroll-all-loops)
fi
if test x$enable_stack_trace != xyes; then

4
net/silc-client/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.70 2013/03/11 11:35:56 espie Exp $
# $OpenBSD: Makefile,v 1.71 2013/11/04 21:50:22 brad Exp $
COMMENT= Secure Internet Live Conferencing (SILC) client
DISTNAME= silc-client-1.1.8
REVISION= 8
REVISION= 9
CATEGORIES= net
HOMEPAGE= http://www.silcnet.org/

21
net/silc-client/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.7 2009/08/01 19:24:34 sthen Exp $
$OpenBSD: patch-configure_ac,v 1.8 2013/11/04 21:50:22 brad Exp $
--- configure.ac.orig Sat Aug 1 02:53:41 2009
+++ configure.ac Sat Aug 1 12:15:39 2009
+++ configure.ac Sun Aug 21 01:56:13 2011
@@ -97,9 +97,6 @@ AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue)
AM_CONDITIONAL(SILC_POWERPC, test x$cpu_ppc = xtrue)
AM_CONDITIONAL(SILC_IA64, test x$cpu_ia64 = xtrue)
@ -84,3 +84,20 @@ $OpenBSD: patch-configure_ac,v 1.7 2009/08/01 19:24:34 sthen Exp $
if test x$compile_libs = xfalse; then
LIBSUBDIR=
@@ -1294,7 +1241,7 @@ fi
SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fno-regmove)
if test x$summary_debug = xno -a x$want_cc_optimizations = xtrue; then
- SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fomit-frame-pointer -O3)
+ SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fomit-frame-pointer)
fi
AC_SUBST(SILC_CRYPTO_CFLAGS)
@@ -1330,7 +1277,6 @@ if test x$compile_libs = xtrue; then
AC_MSG_NOTICE([configuring math library])
if test x$want_cc_optimizations = xtrue; then
- SILC_ADD_CC_FLAGS(MATH, -O3, SILC_ADD_CC_FLAGS(MATH, -O2))
SILC_ADD_CC_FLAGS(MATH, -funroll-all-loops)
fi
if test x$enable_stack_trace != xyes; then

4
net/silc-server/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.68 2013/03/21 08:46:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.69 2013/11/04 21:50:09 brad Exp $
COMMENT= Secure Internet Live Conferencing (SILC) server
DISTNAME= silc-server-1.1.18
REVISION= 3
REVISION= 4
CATEGORIES= net
HOMEPAGE= http://www.silcnet.org/

31
net/silc-server/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.5 2009/08/01 09:21:55 sthen Exp $
--- configure.ac.orig Sat Aug 1 10:15:08 2009
+++ configure.ac Sat Aug 1 10:15:08 2009
$OpenBSD: patch-configure_ac,v 1.6 2013/11/04 21:50:09 brad Exp $
--- configure.ac.orig Sat Sep 26 16:34:14 2009
+++ configure.ac Sun Aug 21 01:54:37 2011
@@ -97,9 +97,6 @@ AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue)
AM_CONDITIONAL(SILC_POWERPC, test x$cpu_ppc = xtrue)
AM_CONDITIONAL(SILC_IA64, test x$cpu_ia64 = xtrue)
@ -73,11 +73,10 @@ $OpenBSD: patch-configure_ac,v 1.5 2009/08/01 09:21:55 sthen Exp $
#
# Workaround a bug in GCC 2.x which causes memory exhaustion
# when compiling sha1 with optimizations on UltraSPARC.
@@ -578,55 +525,6 @@ AC_DEFINE_UNQUOTED([SILC_DOCDIR], "$DOCDIR", [SILC_DOC
# SILC library checking
@@ -579,55 +526,6 @@ AC_DEFINE_UNQUOTED([SILC_DOCDIR], "$DOCDIR", [SILC_DOC
compile_libs=true
LIBSUBDIR=lib
-
-AC_ARG_WITH(silc-includes,
- [ --with-silc-includes=DIR SILC Toolkit includes [search in DIR]],
- [ac_silc_includes="$withval"], [ac_silc_includes="no"])
@ -126,6 +125,24 @@ $OpenBSD: patch-configure_ac,v 1.5 2009/08/01 09:21:55 sthen Exp $
- fi
-fi
-
-
# SOCKS4 support checking
#
SAVE_LIBS="$LIBS"
@@ -1291,7 +1189,7 @@ fi
SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fno-regmove)
if test x$summary_debug = xno -a x$want_cc_optimizations = xtrue; then
- SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fomit-frame-pointer -O3)
+ SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fomit-frame-pointer)
fi
AC_SUBST(SILC_CRYPTO_CFLAGS)
@@ -1327,7 +1225,6 @@ if test x$compile_libs = xtrue; then
AC_MSG_NOTICE([configuring math library])
if test x$want_cc_optimizations = xtrue; then
- SILC_ADD_CC_FLAGS(MATH, -O3, SILC_ADD_CC_FLAGS(MATH, -O2))
SILC_ADD_CC_FLAGS(MATH, -funroll-all-loops)
fi
if test x$enable_stack_trace != xyes; then