Respect user CFLAGS.

Package-Manager: portage-2.0.51.19

4 files changed, 119 insertions, 11 deletions

diff --git a/app-emulation/dosemu/ChangeLog b/app-emulation/dosemu/ChangeLog
index 25e9c63b928d..5a9b8ce9c1b8 100644
--- a/app-emulation/dosemu/ChangeLog
+++ b/app-emulation/dosemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/dosemu
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.25 2005/02/18 15:11:40 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.26 2005/04/05 05:22:02 eradicator Exp $
+
+  05 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/dosemu-1.2.2-cflags.patch, dosemu-1.2.2-r1.ebuild:
+  Respect user CFLAGS.
 
   18 Feb 2005; Hanno Boeck <hanno@gentoo.org> dosemu-1.2.2-r1.ebuild:
   Fixed compilation on hardened profile.
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 043396a63fb6..abf91bbe6387 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -1,12 +1,23 @@
-MD5 ac9d9b72d4bc6fff40049dc3c3daf0ba ChangeLog 3642
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 66b93424e041ab71f6fa79211bd98042 ChangeLog 3788
+MD5 a82db77e6fbec7c01e2f0f8780750e4b dosemu-1.2.0.ebuild 1268
 MD5 61467ef407e42f1b13d8668a4fcae951 dosemu-1.2.1.ebuild 1269
-MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+MD5 c46b4e02cbd1b24e64921ef2019def94 dosemu-1.2.2-r1.ebuild 1595
 MD5 9aa383239a58607f2da3c0ef004fe398 dosemu-1.2.2.ebuild 1343
-MD5 a82db77e6fbec7c01e2f0f8780750e4b dosemu-1.2.0.ebuild 1268
-MD5 fa66f2d070839a4e2e473eb92597b675 dosemu-1.2.2-r1.ebuild 1375
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+MD5 919e6e482f0bc9f366177904eae0b7c1 files/digest-dosemu-1.2.0 133
 MD5 f07393e4b6ed8e7785ada12c7c1e9763 files/digest-dosemu-1.2.1 133
-MD5 d9edbc98f1c06b2c5ad563ab29928ec0 files/dosemu_kernel26_patch 1480
 MD5 c55a4301f45354bf6dd78364654eedf8 files/digest-dosemu-1.2.2 133
 MD5 7b6524cc4d37cd8b381b03fbd1db190b files/digest-dosemu-1.2.2-r1 135
 MD5 11e355fbc16d4a8c49fbd93df36e1350 files/dosemu-broken-links.diff 521
-MD5 919e6e482f0bc9f366177904eae0b7c1 files/digest-dosemu-1.2.0 133
+MD5 d9edbc98f1c06b2c5ad563ab29928ec0 files/dosemu_kernel26_patch 1480
+MD5 497a92330b10bea8772669b9bb821233 files/dosemu-1.2.2-cflags.patch 2584
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCUiCKArHZZzCEUG0RAoADAJkBUVJCZOxzId72T3K8kGt7ueioiQCeJLuo
+id7i+53k9j0/wz5FD5Izr4s=
+=G8Y3
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/dosemu/dosemu-1.2.2-r1.ebuild b/app-emulation/dosemu/dosemu-1.2.2-r1.ebuild
index 715a742a7140..195c35671fe7 100644
--- a/app-emulation/dosemu/dosemu-1.2.2-r1.ebuild
+++ b/app-emulation/dosemu/dosemu-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.2.2-r1.ebuild,v 1.4 2005/02/20 00:43:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.2.2-r1.ebuild,v 1.5 2005/04/05 05:22:02 eradicator Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,15 +15,22 @@ SLOT="0"
 KEYWORDS="-* ~x86"
 IUSE="X svga gpm debug"
 
-DEPEND="X? ( virtual/x11 )
+RDEPEND="X? ( virtual/x11 )
 	svga? ( media-libs/svgalib )
 	gpm? ( sys-libs/gpm )
 	sys-libs/slang"
 
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.57"
+
 src_unpack() {
 	unpack ${P}.tgz
 	cd ${S}
-	epatch ${FILESDIR}/dosemu-broken-links.diff
+	epatch ${FILESDIR}/${PN}-broken-links.diff
+	epatch ${FILESDIR}/${P}-cflags.patch
+
+	WANT_AUTOCONF=2.5
+	autoconf || die "autoconf failed"
 }
 
 src_compile() {
@@ -37,7 +44,10 @@ src_compile() {
 
 	# Has problems with -O3 on some systems
 	replace-flags -O[3-9] -O2
-	append-flags -fno-pic
+
+	# Fix compilation on hardened.  filter -fPIC rather than appending
+	# -fno-pic
+	filter-flage -fPIC
 
 	econf ${myflags} || die "DOSemu Base Configuration Failed"
 
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)