From 4e2af845c4652b92d4de6762070af54c7af567a7 Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 30 Aug 2007 15:16:11 +0000 Subject: Fix linker usage. --- audio/freealut/Makefile | 3 ++- audio/freealut/distinfo | 5 ++++- audio/freealut/patches/patch-aa | 13 +++++++++++++ audio/freealut/patches/patch-ab | 13 +++++++++++++ audio/freealut/patches/patch-ac | 13 +++++++++++++ 5 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 audio/freealut/patches/patch-aa create mode 100644 audio/freealut/patches/patch-ab create mode 100644 audio/freealut/patches/patch-ac (limited to 'audio/freealut') diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile index 43b7169f091..3c038b7fe2a 100644 --- a/audio/freealut/Makefile +++ b/audio/freealut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/07/13 14:50:17 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2007/08/30 15:16:11 joerg Exp $ # DISTNAME= freealut-1.1.0 @@ -14,5 +14,6 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= admin/pkgconfig/freealut.pc.in +.include "../../mk/pthread.buildlink3.mk" .include "../../audio/openal/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/freealut/distinfo b/audio/freealut/distinfo index a24a8a017a4..8673ea8c812 100644 --- a/audio/freealut/distinfo +++ b/audio/freealut/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/07/13 14:50:17 drochner Exp $ +$NetBSD: distinfo,v 1.2 2007/08/30 15:16:11 joerg Exp $ SHA1 (freealut-1.1.0.tar.gz) = b2c04d2b5e0896b3164c01deda39f58933c8055f RMD160 (freealut-1.1.0.tar.gz) = 6cbf31bd2e51240721a5ee919e576e7348d954ab Size (freealut-1.1.0.tar.gz) = 461830 bytes +SHA1 (patch-aa) = f7909d91a62c9bbeb554926b64fc49f26a794b3b +SHA1 (patch-ab) = d5d926a3e1ef7aee0e911051e36fca298a38c833 +SHA1 (patch-ac) = 814e5385948d3f6406e932565923f765912a220e diff --git a/audio/freealut/patches/patch-aa b/audio/freealut/patches/patch-aa new file mode 100644 index 00000000000..14e4f220172 --- /dev/null +++ b/audio/freealut/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2007/08/30 15:16:11 joerg Exp $ + +--- src/Makefile.am.orig 2007-08-30 13:59:11.000000000 +0000 ++++ src/Makefile.am +@@ -20,7 +20,7 @@ libalut_la_SOURCES = \ + alutWaveform.c + + # We use sin and floor, so we might need -lm, autoconf takes care of this. +-libalut_la_LIBADD = $(LIBM) ++libalut_la_LIBADD = -lopenal $(LIBM) + + # The following libtool flag is neccessary for building DLLs on Windows. + libalut_la_LDFLAGS = -no-undefined diff --git a/audio/freealut/patches/patch-ab b/audio/freealut/patches/patch-ab new file mode 100644 index 00000000000..2e41062b85c --- /dev/null +++ b/audio/freealut/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2007/08/30 15:16:11 joerg Exp $ + +--- src/Makefile.in.orig 2007-08-30 13:59:08.000000000 +0000 ++++ src/Makefile.in +@@ -219,7 +219,7 @@ libalut_la_SOURCES = \ + + + # We use sin and floor, so we might need -lm, autoconf takes care of this. +-libalut_la_LIBADD = $(LIBM) ++libalut_la_LIBADD = -lopenal $(LIBM) + + # The following libtool flag is neccessary for building DLLs on Windows. + diff --git a/audio/freealut/patches/patch-ac b/audio/freealut/patches/patch-ac new file mode 100644 index 00000000000..ac7a7e5e485 --- /dev/null +++ b/audio/freealut/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2007/08/30 15:16:11 joerg Exp $ + +--- examples/Makefile.in.orig 2007-08-30 14:45:24.000000000 +0000 ++++ examples/Makefile.in +@@ -189,7 +189,7 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + + # We need to link against our *own* libalut. +-LDADD = ../src/libalut.la ++LDADD = ../src/libalut.la ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} + + # Specifying the following path is needed to find . + AM_CPPFLAGS = -I$(top_srcdir)/include -- cgit v1.2.3