Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 183922 Details for
Bug 261214
net-print/cups-1.3* ignores user cflags and worse, tries to choose/force its own cflags
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
This patch removes cups' horrible optimization attemps
cups-remove-optimizations.patch (text/plain), 10.29 KB, created by
Ryan Hope
on 2009-03-04 19:51:06 UTC
(
hide
)
Description:
This patch removes cups' horrible optimization attemps
Filename:
MIME Type:
Creator:
Ryan Hope
Created:
2009-03-04 19:51:06 UTC
Size:
10.29 KB
patch
obsolete
>diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 >index 8d40221..67b2016 100644 >--- a/config-scripts/cups-compiler.m4 >+++ b/config-scripts/cups-compiler.m4 >@@ -91,418 +91,12 @@ if test -n "$GCC"; then > # Add GCC-specific compiler options... > if test -z "$OPTIM"; then > if test "x$with_optim" = x; then >- # Default to optimize-for-size and debug >- OPTIM="-Os -g" >+ # Default to NOTHING!!! >+ OPTIM="" > else > OPTIM="$with_optim $OPTIM" > fi > fi >- >- # Generate position-independent code as needed... >- if test $PICFLAG = 1 -a $uname != AIX; then >- OPTIM="-fPIC $OPTIM" >- fi >- >- # The -fstack-protector option is available with some versions of >- # GCC and adds "stack canaries" which detect when the return address >- # has been overwritten, preventing many types of exploit attacks. >- AC_MSG_CHECKING(if GCC supports -fstack-protector) >- OLDCFLAGS="$CFLAGS" >- CFLAGS="$CFLAGS -fstack-protector" >- AC_TRY_COMPILE(,, >- OPTIM="$OPTIM -fstack-protector" >- AC_MSG_RESULT(yes), >- AC_MSG_RESULT(no)) >- CFLAGS="$OLDCFLAGS" >- >- # The -pie option is available with some versions of GCC and adds >- # randomization of addresses, which avoids another class of exploits >- # that depend on a fixed address for common functions. >- if test x$enable_pie = xyes; then >- AC_MSG_CHECKING(if GCC supports -pie) >- OLDCFLAGS="$CFLAGS" >- CFLAGS="$CFLAGS -pie -fPIE" >- AC_TRY_COMPILE(,, >- PIEFLAGS="-pie -fPIE" >- AC_MSG_RESULT(yes), >- AC_MSG_RESULT(no, ignoring --enable-pie)) >- CFLAGS="$OLDCFLAGS" >- fi >- >- if test "x$with_optim" = x; then >- # Add useful warning options for tracking down problems... >- OPTIM="-Wall -Wno-format-y2k $OPTIM" >- # Additional warning options for development testing... >- if test -d .svn; then >- OPTIM="-Wshadow -Wunused $OPTIM" >- fi >- fi >- >- case "$uname" in >- Darwin*) >- # -D_FORTIFY_SOURCE=2 adds additional object size >- # checking, basically wrapping all string functions >- # with buffer-limited ones. Not strictly needed for >- # CUPS since we already use buffer-limited calls, but >- # this will catch any additions that are broken. >- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" >- >- if test x$enable_pie = xyes; then >- # GCC 4 on Mac OS X needs -Wl,-pie as well >- LDFLAGS="$LDFLAGS -Wl,-pie" >- fi >- ;; >- >- HP-UX*) >- if test "x$enable_32bit" = xyes; then >- # Build 32-bit libraries, 64-bit base... >- if test -z "$with_arch32flags"; then >- ARCH32FLAGS="-milp32" >- else >- ARCH32FLAGS="$with_arch32flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch64flags"; then >- ARCHFLAGS="-mlp64" >- else >- ARCHFLAGS="$with_arch64flags" >- fi >- fi >- fi >- >- if test "x$enable_64bit" = xyes; then >- # Build 64-bit libraries, 32-bit base... >- if test -z "$with_arch64flags"; then >- ARCH64FLAGS="-mlp64" >- else >- ARCH64FLAGS="$with_arch64flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch32flags"; then >- ARCHFLAGS="-milp32" >- else >- ARCHFLAGS="$with_arch32flags" >- fi >- fi >- fi >- ;; >- >- IRIX) >- if test "x$enable_32bit" = xyes; then >- # Build 32-bit libraries, 64-bit base... >- if test -z "$with_arch32flags"; then >- ARCH32FLAGS="-n32 -mips3" >- else >- ARCH32FLAGS="$with_arch32flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch64flags"; then >- ARCHFLAGS="-64 -mips4" >- else >- ARCHFLAGS="$with_arch64flags" >- fi >- fi >- fi >- >- if test "x$enable_64bit" = xyes; then >- # Build 64-bit libraries, 32-bit base... >- if test -z "$with_arch64flags"; then >- ARCH64FLAGS="-64 -mips4" >- else >- ARCH64FLAGS="$with_arch64flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch32flags"; then >- ARCHFLAGS="-n32 -mips3" >- else >- ARCHFLAGS="$with_arch32flags" >- fi >- fi >- fi >- ;; >- >- Linux*) >- # The -z relro option is provided by the Linux linker command to >- # make relocatable data read-only. >- if test x$enable_relro = xyes; then >- RELROFLAGS="-Wl,-z,relro" >- fi >- >- if test "x$enable_32bit" = xyes; then >- # Build 32-bit libraries, 64-bit base... >- if test -z "$with_arch32flags"; then >- ARCH32FLAGS="-m32" >- else >- ARCH32FLAGS="$with_arch32flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch64flags"; then >- ARCHFLAGS="-m64" >- else >- ARCHFLAGS="$with_arch64flags" >- fi >- fi >- fi >- >- if test "x$enable_64bit" = xyes; then >- # Build 64-bit libraries, 32-bit base... >- if test -z "$with_arch64flags"; then >- ARCH64FLAGS="-m64" >- else >- ARCH64FLAGS="$with_arch64flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch32flags"; then >- ARCHFLAGS="-m32" >- else >- ARCHFLAGS="$with_arch32flags" >- fi >- fi >- fi >- ;; >- >- SunOS*) >- if test "x$enable_32bit" = xyes; then >- # Build 32-bit libraries, 64-bit base... >- if test -z "$with_arch32flags"; then >- ARCH32FLAGS="-m32" >- else >- ARCH32FLAGS="$with_arch32flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch64flags"; then >- ARCHFLAGS="-m64" >- else >- ARCHFLAGS="$with_arch64flags" >- fi >- fi >- fi >- >- if test "x$enable_64bit" = xyes; then >- # Build 64-bit libraries, 32-bit base... >- if test -z "$with_arch64flags"; then >- ARCH64FLAGS="-m64" >- else >- ARCH64FLAGS="$with_arch64flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch32flags"; then >- ARCHFLAGS="-m32" >- else >- ARCHFLAGS="$with_arch32flags" >- fi >- fi >- fi >- ;; >- esac >-else >- # Add vendor-specific compiler options... >- case $uname in >- AIX*) >- if test -z "$OPTIM"; then >- if test "x$with_optim" = x; then >- OPTIM="-O2 -qmaxmem=6000" >- else >- OPTIM="$with_optim $OPTIM" >- fi >- fi >- ;; >- HP-UX*) >- if test -z "$OPTIM"; then >- if test "x$with_optim" = x; then >- OPTIM="+O2" >- else >- OPTIM="$with_optim $OPTIM" >- fi >- fi >- >- CFLAGS="-Ae $CFLAGS" >- # Warning 336 is "empty translation unit" >- # Warning 829 is passing constant string as char * >- CXXFLAGS="+W336,829 $CXXFLAGS" >- >- if test $PICFLAG = 1; then >- OPTIM="+z $OPTIM" >- fi >- >- if test "x$enable_32bit" = xyes; then >- # Build 32-bit libraries, 64-bit base... >- if test -z "$with_arch32flags"; then >- ARCH32FLAGS="+DD32" >- else >- ARCH32FLAGS="$with_arch32flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch64flags"; then >- ARCHFLAGS="+DD64" >- else >- ARCHFLAGS="$with_arch64flags" >- fi >- fi >- fi >- >- if test "x$enable_64bit" = xyes; then >- # Build 64-bit libraries, 32-bit base... >- if test -z "$with_arch64flags"; then >- ARCH64FLAGS="+DD64" >- else >- ARCH64FLAGS="$with_arch64flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch32flags"; then >- ARCHFLAGS="+DD32" >- else >- ARCHFLAGS="$with_arch32flags" >- fi >- fi >- fi >- ;; >- IRIX) >- if test -z "$OPTIM"; then >- if test "x$with_optim" = x; then >- OPTIM="-O2" >- else >- OPTIM="$with_optim $OPTIM" >- fi >- fi >- >- if test "x$with_optim" = x; then >- OPTIM="-fullwarn -woff 1183,1209,1349,1506,3201 $OPTIM" >- fi >- >- if test "x$enable_32bit" = xyes; then >- # Build 32-bit libraries, 64-bit base... >- if test -z "$with_arch32flags"; then >- ARCH32FLAGS="-n32 -mips3" >- else >- ARCH32FLAGS="$with_arch32flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch64flags"; then >- ARCHFLAGS="-64 -mips4" >- else >- ARCHFLAGS="$with_arch64flags" >- fi >- fi >- fi >- >- if test "x$enable_64bit" = xyes; then >- # Build 64-bit libraries, 32-bit base... >- if test -z "$with_arch64flags"; then >- ARCH64FLAGS="-64 -mips4" >- else >- ARCH64FLAGS="$with_arch64flags" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch32flags"; then >- ARCHFLAGS="-n32 -mips3" >- else >- ARCHFLAGS="$with_arch32flags" >- fi >- fi >- fi >- ;; >- OSF*) >- # Tru64 UNIX aka Digital UNIX aka OSF/1 >- if test -z "$OPTIM"; then >- if test "x$with_optim" = x; then >- OPTIM="-O" >- else >- OPTIM="$with_optim" >- fi >- fi >- ;; >- SunOS*) >- # Solaris >- if test -z "$OPTIM"; then >- if test "x$with_optim" = x; then >- OPTIM="-xO2" >- else >- OPTIM="$with_optim $OPTIM" >- fi >- fi >- >- if test $PICFLAG = 1; then >- OPTIM="-KPIC $OPTIM" >- fi >- >- if test "x$enable_32bit" = xyes; then >- # Compiling on a Solaris system, build 64-bit >- # binaries with separate 32-bit libraries... >- ARCH32FLAGS="-xarch=generic" >- >- if test "x$with_optim" = x; then >- # Suppress all of Sun's questionable >- # warning messages, and default to >- # 64-bit compiles of everything else... >- OPTIM="-w $OPTIM" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch64flags"; then >- ARCHFLAGS="-xarch=generic64" >- else >- ARCHFLAGS="$with_arch64flags" >- fi >- fi >- else >- if test "x$enable_64bit" = xyes; then >- # Build 64-bit libraries... >- ARCH64FLAGS="-xarch=generic64" >- fi >- >- if test "x$with_optim" = x; then >- # Suppress all of Sun's questionable >- # warning messages, and default to >- # 32-bit compiles of everything else... >- OPTIM="-w $OPTIM" >- fi >- >- if test -z "$with_archflags"; then >- if test -z "$with_arch32flags"; then >- ARCHFLAGS="-xarch=generic" >- else >- ARCHFLAGS="$with_arch32flags" >- fi >- fi >- fi >- ;; >- UNIX_SVR*) >- # UnixWare >- if test -z "$OPTIM"; then >- if test "x$with_optim" = x; then >- OPTIM="-O" >- else >- OPTIM="$with_optim $OPTIM" >- fi >- fi >- >- if test $PICFLAG = 1; then >- OPTIM="-KPIC $OPTIM" >- fi >- ;; >- *) >- # Running some other operating system; inform the user they >- # should contribute the necessary options to >- # cups-support@cups.org... >- echo "Building CUPS with default compiler optimizations; contact" >- echo "cups-bugs@cups.org with uname and compiler options needed" >- echo "for your platform, or set the CFLAGS, CXXFLAGS, and LDFLAGS" >- echo "environment variables before running configure." >- ;; >- esac > fi > > # Add general compiler options per platform...
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=183922">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 261214
: 183922 |
191277
