Disable hand-rolled assembly on Solaris, the style is incompatible with

the Solaris linker, and -mimpure-text is no longer an option with GCC.

Fixes build on Solaris/GCC.

4 files changed, 16 insertions, 25 deletions

diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index 9ae6905894a..75c86d17f66 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2012/09/15 10:03:32 obache Exp $
+# $NetBSD: Makefile,v 1.48 2012/09/26 12:55:11 jperkin Exp $
 #
 
 BMP_ENABLE_ENCODERS=	yes
@@ -21,10 +21,6 @@ PRINT_PLIST_AWK+=	/cdaudio/ { print "$${PLIST.cdaudio}" $$0; next }
 USE_LANGUAGES=		c c++
 LDFLAGS.NetBSD+=	-lstdc++ -lm
 
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	SunOS_LDFLAGS="-shared -mimpure-text"
-.endif
-
 .include "../../audio/id3lib/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
diff --git a/audio/bmp/distinfo b/audio/bmp/distinfo
index d6abddba250..ff49d78c406 100644
--- a/audio/bmp/distinfo
+++ b/audio/bmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2011/09/14 15:45:30 hans Exp $
+$NetBSD: distinfo,v 1.14 2012/09/26 12:55:11 jperkin Exp $
 
 SHA1 (bmp-0.9.7-ipv6-simple.diff) = d80943d504eeb06d96c2ca73ecc80a89b77e7c77
 RMD160 (bmp-0.9.7-ipv6-simple.diff) = 96072b98f774ed8614818664d0fe173ea5a3e4e5
@@ -7,10 +7,9 @@ SHA1 (bmp-0.9.7.1.tar.gz) = ab6444b9a35a8bb8e920a781e72d963a3fb60547
 RMD160 (bmp-0.9.7.1.tar.gz) = 9288083918913ca97ab8883d616159055931ade7
 Size (bmp-0.9.7.1.tar.gz) = 2056564 bytes
 SHA1 (patch-aa) = fbaa61ef68857c12b4506180a9d8d290dbf6615f
-SHA1 (patch-an) = da55750c5ee50acfd25e695813bfc025c4fc7b5f
+SHA1 (patch-an) = dca39915d93f99ead493bc6913469e791f2d0c79
 SHA1 (patch-ao) = c24712090587ff622d7b9df68757c984a057c6c2
 SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa
 SHA1 (patch-aq) = 56f42dbd772304f9205b519b2654487b9a45091b
 SHA1 (patch-ar) = 037d02b72cee6b2fdd24f9d41c28ec1220dcdf67
 SHA1 (patch-as) = dc1d9dc2100664c1ab4448234239d45741907604
-SHA1 (patch-at) = a643d4bc95d84424226f742675abc87c18834af5
diff --git a/audio/bmp/patches/patch-an b/audio/bmp/patches/patch-an
index 9ff8775b3c5..dec10e8f544 100644
--- a/audio/bmp/patches/patch-an
+++ b/audio/bmp/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1 2004/05/15 09:34:53 jmmv Exp $
+$NetBSD: patch-an,v 1.2 2012/09/26 12:55:12 jperkin Exp $
 
---- configure.orig	2003-12-24 20:16:01.000000000 +0100
-+++ configure
-@@ -30074,7 +30074,7 @@ fi
+--- configure.orig	Sat Oct 22 10:45:08 2005
++++ configure	Wed Sep 26 12:31:51 2012
+@@ -28454,7 +28454,7 @@
  done
  
  
@@ -11,3 +11,12 @@ $NetBSD: patch-an,v 1.1 2004/05/15 09:34:53 jmmv Exp $
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -28804,7 +28804,7 @@
+     i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
+         arch_type=ix86
+         case "$host" in
+-            *-*-netbsd* | *-*openbsd*)
++            *-*-netbsd* | *-*openbsd* | *-solaris*)
+             ;;
+             *)
+                 ARCH_DEFINES="-DI386_ASSEM"
diff --git a/audio/bmp/patches/patch-at b/audio/bmp/patches/patch-at
deleted file mode 100644
index 3b300573106..00000000000
--- a/audio/bmp/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2011/09/14 15:45:30 hans Exp $
-
---- Input/mpg123/Makefile.in.orig	2011-09-13 15:02:57.309943222 +0200
-+++ Input/mpg123/Makefile.in	2011-09-13 15:15:51.386590197 +0200
-@@ -113,7 +113,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(AM_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@
- CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
- LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
- 	$(CCASFLAGS)