summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-04-05 05:22:02 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-04-05 05:22:02 +0000
commit6b2c244978e2fcf69ed63cc78818e72eb2ff632c (patch)
treec7610edc8795e2d1e136c011c35d7c62d2d2cc5f /app-emulation/dosemu/files
parentVersion bump. (diff)
downloadgentoo-2-6b2c244978e2fcf69ed63cc78818e72eb2ff632c.tar.gz
gentoo-2-6b2c244978e2fcf69ed63cc78818e72eb2ff632c.tar.bz2
gentoo-2-6b2c244978e2fcf69ed63cc78818e72eb2ff632c.zip
Respect user CFLAGS.
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-emulation/dosemu/files')
-rw-r--r--app-emulation/dosemu/files/dosemu-1.2.2-cflags.patch83
1 files changed, 83 insertions, 0 deletions
diff --git a/app-emulation/dosemu/files/dosemu-1.2.2-cflags.patch b/app-emulation/dosemu/files/dosemu-1.2.2-cflags.patch
new file mode 100644
index 000000000000..c779b3077d6a
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.2.2-cflags.patch
@@ -0,0 +1,83 @@
+--- dosemu-1.2.2/configure.ac.orig 2005-04-04 21:58:49.635588970 -0700
++++ dosemu-1.2.2/configure.ac 2005-04-04 21:56:35.277976095 -0700
+@@ -15,7 +15,6 @@ AC_CONFIG_HEADER(src/include/config.h)
+ AC_CANONICAL_TARGET([])
+
+ dnl Checks for programs.
+-OPT=$CFLAGS
+ AC_PROG_CC
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_AWK
+@@ -447,19 +446,6 @@ dnl Now CFLAGS and INCLUDES
+ INCDIR="-I\${top_builddir}/src/include -I\${top_builddir}/src/plugin/include ${SLANGINC}"
+ AC_SUBST(INCDIR)
+
+-CFLAGS="-Wall -Wstrict-prototypes -Wmissing-declarations -Wnested-externs"
+-if test -z "$OPT"; then
+- if test "$enable_debug" = "yes"; then
+- CFLAGS="$CFLAGS -g"
+- AC_DEFINE(_DEBUG)
+- OPT="-O"
+- else
+- OPT="-O2" # BIG NOTE: do _not_ use -O3,
+- # because in forces _inline_ at places where we don't want it !
+- # If we want _inline_, well then we 'code' it.
+- OPT="$OPT -fomit-frame-pointer" # never omit the frame pointer when debugging!
+- fi
+-fi
+ if test "$enable_debug" = "yes"; then
+ AC_DEFINE(_DEBUG)
+ fi
+@@ -509,7 +495,6 @@ if test "$CONFIG_HOST" = "linux"; then
+ AC_MSG_NOTICE(Compiling with network support...);
+ AC_DEFINE(USING_NET)
+ fi
+- PIPE=-pipe
+ fi
+
+
+@@ -545,36 +530,6 @@ if test "$GCC" = "yes" ; then
+ fi
+
+
+- # -m486 is usually in the specs for the compiler
+- # but gcc-3.0 wants -mcpu=i486 instead
+- # and gcc-3.4 wants -mtune=i486 instead
+- # let the compiler options be dependent of the _target_
+- # where dosemu is compiled for, not the host
+- if test "$target_cpu" = "athlon" -a $GCC_VERSION_CODE -le 2095 ; then
+- target_cpu="i686"
+- fi
+- if test "$GCC_VERSION_CODE" -ge 3004 ; then
+- OPT="$OPT -mtune=$target_cpu"
+- elif test "$GCC_VERSION_CODE" -ge 2095 ; then
+- OPT="$OPT -mcpu=$target_cpu"
+- else
+- case "$target_cpu" in
+- i486)
+- OPT="$OPT -m486"
+- ;;
+- i386)
+- OPT="$OPT -m386"
+- ;;
+- *)
+- ;;
+- esac
+- fi
+- if test "$target_cpu" = "athlon"; then
+- OPT="$OPT -malign-functions=4 -fexpensive-optimizations"
+- elif test "$target_cpu" = "i486"; then
+- OPT="$OPT -malign-loops=2 -malign-jumps=2 -malign-functions=2"
+- fi
+-
+ AC_MSG_CHECKING(for glibc...)
+ set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|gcc -E -|awk '/XXAaZZ/ {print $2 " " $4}'`
+ major=$1; minor=$2
+@@ -595,7 +550,6 @@ AC_DEFINE_UNQUOTED(GCC_VERSION_CODE,$GCC
+ AC_SUBST(ASM_PEDANTIC)
+ AC_DEFINE(_GNU_SOURCE)
+
+-CFLAGS="${CFLAGS} ${OPT} ${PIPE}"
+ CPPFLAGS="${CPPFLAGS} -MMD \${INCDIR}"
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(LIBS)