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, 5 insertions, 31 deletions

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 51c88aa53be..757a54b6953 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2011/10/17 19:45:55 shattered Exp $
+# $NetBSD: Makefile,v 1.52 2012/09/26 13:06:17 jperkin Exp $
 
 PKGNAME=	${DISTNAME:C/[^[:alnum:]]*//}
 PKGREVISION=	1
@@ -37,10 +37,6 @@ CPPFLAGS+=	-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 CPPFLAGS+=	-DDEVOSSSOUND="\"${DEVOSSSOUND}\""
 .endif
 
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	SunOS_LDFLAGS="-shared -mimpure-text"
-.endif
-
 # MPG123_MODULE is not finally set yet, to avoid NOT_FOR_PLATFORM triggers
 .include "Makefile.common"
 
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index a73bd47f480..09fe5a29030 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2011/10/17 19:45:55 shattered Exp $
+$NetBSD: distinfo,v 1.35 2012/09/26 13:06:18 jperkin Exp $
 
 SHA1 (mpg123-1.12.5.tar.bz2) = 476cb47a9b6570684b5af536beedf2026522e5f8
 RMD160 (mpg123-1.12.5.tar.bz2) = a59b0f7506b004c6e7d048ebef57090e1eb857af
@@ -7,5 +7,4 @@ SHA1 (patch-aa) = 9700187dc38af7d4b7f4f3332d76556d2cb7f418
 SHA1 (patch-ad) = 7ea68b64ee8a0e58036f79558ca1484870b0335a
 SHA1 (patch-af) = ed89154abc9e4eea7934e6b11431b4b8f95d36b0
 SHA1 (patch-ah) = 86754993466714cb2208a9291b72e8e03dde19c7
-SHA1 (patch-ai) = 9ce00cfa1dac387ea7b5df19fa4b1483b598748f
 SHA1 (patch-aj) = ab7e4b9ae33d8cabce4d381c6e07157cfb48e0b1
diff --git a/audio/mpg123/options.mk b/audio/mpg123/options.mk
index 903d037b8b4..2007caadf44 100644
--- a/audio/mpg123/options.mk
+++ b/audio/mpg123/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2012/06/17 07:17:57 tron Exp $
+# $NetBSD: options.mk,v 1.3 2012/09/26 13:06:18 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.mpg123
 PKG_OPTIONS_OPTIONAL_GROUPS=	fpu
@@ -8,7 +8,8 @@ PKG_SUGGESTED_OPTIONS+=		mpg123-fifo
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if (${MACHINE_ARCH} == "i386")
-.  if empty(MACHINE_PLATFORM:MDarwin-11.*-i386)
+.  if empty(MACHINE_PLATFORM:MDarwin-11.*-i386) && \
+      empty(MACHINE_PLATFORM:MSunOS-*)
 PKG_OPTIONS_GROUP.fpu=		mpg123-x86-dither mpg123-with-fpu
 PKG_SUGGESTED_OPTIONS+=		mpg123-x86-dither
 .  else
diff --git a/audio/mpg123/patches/patch-ai b/audio/mpg123/patches/patch-ai
deleted file mode 100644
index 69e6c42c600..00000000000
--- a/audio/mpg123/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.7 2011/09/14 15:46:49 hans Exp $
-
---- src/libmpg123/Makefile.in.orig	2010-10-04 08:34:18.000000000 +0200
-+++ src/libmpg123/Makefile.in	2011-09-13 15:28:48.954583152 +0200
-@@ -79,7 +79,7 @@ am_libmpg123_la_OBJECTS = compat.lo pars
- libmpg123_la_OBJECTS = $(am_libmpg123_la_OBJECTS)
- libmpg123_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(libmpg123_la_LDFLAGS) $(LDFLAGS) -o $@
-+	$(libmpg123_la_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@
- testcpu_SOURCES = testcpu.c
- testcpu_OBJECTS = testcpu.$(OBJEXT)
- testcpu_DEPENDENCIES = getcpuflags.$(OBJEXT)
-@@ -100,7 +100,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+	$(LDFLAGS) $(SunOS_LDFLAGS) -o $@
- SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \
- 	testcpu.c
- DIST_SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \