summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2005-06-30 15:47:32 +0000
committervs <vs@FreeBSD.org>2005-06-30 15:47:32 +0000
commitf6986bf5a9b637cddb5fd543764fa3dc86feb046 (patch)
tree189bddf3f628be15be54aa50f2c004b32c1c7977
parente27cd106b1f10c08f68689d12d75e80c6c875b88 (diff)
downloadFreeBSD-ports-f6986bf5a9b637cddb5fd543764fa3dc86feb046.zip
FreeBSD-ports-f6986bf5a9b637cddb5fd543764fa3dc86feb046.tar.gz
Don't link statically to home-grown libltdl
-rw-r--r--devel/yasm/Makefile7
-rw-r--r--devel/yasm/files/patch-Makefile.in18
2 files changed, 22 insertions, 3 deletions
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 733d748..6145ac5 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -14,7 +14,10 @@ MASTER_SITES= http://www.tortall.net/projects/yasm/releases/
MAINTAINER= ports@FreeBSD.org
COMMENT= A complete rewrite of the NASM assembler
+USE_REINPLACE= yes
USE_ICONV= yes
+USE_LIBLTDL= yes
+USE_AUTOCONF_VER=259
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
@@ -26,4 +29,8 @@ MAN1= yasm.1
MAN7= yasm_arch.7
.endif
+post-configure:
+ @${REINPLACE_CMD} 's|$${top_builddir}/libltdl/libltdlc.la|-lltdl|' ${WRKSRC}/Makefile
+ @${RM} -rf ${WRKSRC}/libltdl
+
.include <bsd.port.mk>
diff --git a/devel/yasm/files/patch-Makefile.in b/devel/yasm/files/patch-Makefile.in
index 9f3c023..3c0952d 100644
--- a/devel/yasm/files/patch-Makefile.in
+++ b/devel/yasm/files/patch-Makefile.in
@@ -1,7 +1,10 @@
---- Makefile.in.orig Tue Nov 2 00:46:16 2004
-+++ Makefile.in Tue Nov 2 00:47:10 2004
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
@@ -192,7 +192,7 @@
- $(ACLOCAL_M4)
+ $(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
-mkinstalldirs = $(mkdir_p)
@@ -9,3 +12,12 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(modincludedir)"
+@@ -537,7 +537,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = libltdl m4 po .
++SUBDIRS = m4 po .
+ AM_YFLAGS = -d
+ AM_CFLAGS = @MORE_CFLAGS@
+ AM_CPPFLAGS = -DYASM_MODULEDIR="\"${pkglibdir}\"" -I$(top_srcdir)/check @INCLTDL@
OpenPOWER on IntegriCloud