diff options
| author | jperkin <jperkin@pkgsrc.org> | 2012-09-26 12:55:11 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2012-09-26 12:55:11 +0000 |
| commit | 8b884bec61d9f187f5c9fb06ea8493232e29094f (patch) | |
| tree | b7e78a70e533dce2525c23681a90c6c38119a8fb /audio/libmpg123 | |
| parent | f9bfb87718b6a9d46390024817ab0d35f4b46c54 (diff) | |
| download | pkgsrc-8b884bec61d9f187f5c9fb06ea8493232e29094f.tar.gz | |
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.
Diffstat (limited to 'audio/libmpg123')
| -rw-r--r-- | audio/libmpg123/Makefile | 7 | ||||
| -rw-r--r-- | audio/libmpg123/distinfo | 3 | ||||
| -rw-r--r-- | audio/libmpg123/mpg123-options.mk | 5 | ||||
| -rw-r--r-- | audio/libmpg123/patches/patch-ae | 13 |
4 files changed, 5 insertions, 23 deletions
diff --git a/audio/libmpg123/Makefile b/audio/libmpg123/Makefile index 5043618bcfd..4f9914e6d97 100644 --- a/audio/libmpg123/Makefile +++ b/audio/libmpg123/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/09/12 00:24:43 asau Exp $ +# $NetBSD: Makefile,v 1.7 2012/09/26 13:20:11 jperkin Exp $ # .include "../../audio/libmpg123/Makefile.common" @@ -23,9 +23,4 @@ post-install: .include "mpg123-options.mk" -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -MAKE_ENV+= SunOS_LDFLAGS="-shared -mimpure-text" -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/audio/libmpg123/distinfo b/audio/libmpg123/distinfo index f68d634dc36..e30a03c3041 100644 --- a/audio/libmpg123/distinfo +++ b/audio/libmpg123/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2011/09/14 15:46:01 hans Exp $ +$NetBSD: distinfo,v 1.3 2012/09/26 13:20:12 jperkin Exp $ SHA1 (mpg123-1.5.1.tar.bz2) = 4e85388294c5c432bd899bb910694dd259e76679 RMD160 (mpg123-1.5.1.tar.bz2) = aeaf5ab770eeb66826d81ba3d840492709b2c7a5 @@ -7,4 +7,3 @@ SHA1 (patch-aa) = faf686e1b47bc53ef5155129da2fd0b81632c2f9 SHA1 (patch-ab) = 7d1d36cf5ea4a3e3d0a43da351ac7e3c97c636bf SHA1 (patch-ac) = 751f52278354413e11f857c53e954e2fd56ba06b SHA1 (patch-ad) = 2b888b710499308216a90d48036c1d00327033e3 -SHA1 (patch-ae) = e9b9b661b85fa66e2c16fa2f6466ea82f7e945e2 diff --git a/audio/libmpg123/mpg123-options.mk b/audio/libmpg123/mpg123-options.mk index 7c9be137922..71a7202ab33 100644 --- a/audio/libmpg123/mpg123-options.mk +++ b/audio/libmpg123/mpg123-options.mk @@ -1,4 +1,4 @@ -# $NetBSD: mpg123-options.mk,v 1.2 2012/06/12 15:45:54 wiz Exp $ +# $NetBSD: mpg123-options.mk,v 1.3 2012/09/26 13:20:12 jperkin Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.mpg123 @@ -7,7 +7,8 @@ PKG_SUGGESTED_OPTIONS= inet6 .include "../../mk/bsd.fast.prefs.mk" -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "powerpc" || \ + (${MACHINE_ARCH} == "i386" && ${OPSYS} != "SunOS") PKG_SUPPORTED_OPTIONS+= simd .elif !empty(MACHINE_ARCH:Marm*) PKG_SUPPORTED_OPTIONS+= mpg123-arm-fixed64 diff --git a/audio/libmpg123/patches/patch-ae b/audio/libmpg123/patches/patch-ae deleted file mode 100644 index 293e3dffdf1..00000000000 --- a/audio/libmpg123/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2011/09/14 15:46:02 hans Exp $ - ---- src/libmpg123/Makefile.in.orig 2008-08-29 08:48:07.000000000 +0200 -+++ src/libmpg123/Makefile.in 2011-09-13 15:21:13.667526892 +0200 -@@ -79,7 +79,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 $@ - SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \ - testcpu.c - DIST_SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \ |