Always handle -ldl using the pkgsrc magic, don't depend on weired

BSD detection to avoid it.
This commit is contained in:
joerg 2006-05-28 14:11:24 +00:00
parent ebec39f916
commit 6fc9633468
3 changed files with 17 additions and 2 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.17 2006/05/23 10:52:22 adam Exp $
# $NetBSD: Makefile,v 1.18 2006/05/28 14:11:24 joerg Exp $
DISTNAME= libextractor-0.5.14
CATEGORIES= devel
@ -29,5 +29,6 @@ SHLIBTOOL_OVERRIDE+= ${WRKSRC}/libtool
.include "../../graphics/ImageMagick/buildlink3.mk"
.include "../../multimedia/libmpeg2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.14 2006/05/23 10:52:22 adam Exp $
$NetBSD: distinfo,v 1.15 2006/05/28 14:11:24 joerg Exp $
SHA1 (libextractor-0.5.14.tar.gz) = bdd9b96d00ebc30281decb6fb5c5f097a643122d
RMD160 (libextractor-0.5.14.tar.gz) = 1c5a22650ca9270934ae7295c2670e7261b910c1
Size (libextractor-0.5.14.tar.gz) = 7750318 bytes
SHA1 (patch-aa) = f0923e6cba8e6bb327a7959a3d7679bb78a530b2
SHA1 (patch-ab) = 1516691329cd367d2378ddda6e997f10ef09902f
SHA1 (patch-ac) = a9fea6cd730c82ff71afb1ff49a021f0b3446197
SHA1 (patch-ad) = ece1cacb479e9c70d0aee4f87cc72b84b85de802

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ac,v 1.6 2006/05/28 14:11:24 joerg Exp $
--- src/main/Makefile.in.orig 2006-05-28 13:27:06.000000000 +0000
+++ src/main/Makefile.in
@@ -280,7 +280,7 @@ AM_CFLAGS = \
extract_LDADD = \
$(top_builddir)/src/main/libextractor.la
-@MINGW_FALSE@@SOMEBSD_FALSE@dlflag = -ldl
+dlflag = ${DL_LDFLAGS} ${DL_LIBS}
@HAVE_ZLIB_TRUE@zlib = -lz
@HAVE_BZ2_TRUE@bz2lib = -lbz2
libextractor_la_LDFLAGS = \