From ad39b583dfacac6a07cd60042f3cac1f84ae9e29 Mon Sep 17 00:00:00 2001 From: naddy Date: Sat, 12 Jun 2010 20:56:14 +0000 Subject: [PATCH] Remove g77 dependency. The generated libtool is the same. (Except for now also allowing static linking for Fortran, which was previously misdetected.) ok maintainer --- devel/libtool/Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index 45a688fa3a9..88167e87f4a 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.74 2010/05/23 13:28:16 espie Exp $ -# $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $ +# $OpenBSD: Makefile,v 1.75 2010/06/12 20:56:14 naddy Exp $ COMMENT-main= generic shared library support script COMMENT-ltdl= GNU libtool system independent dlopen wrapper VERSION= 1.5.26 DISTNAME= libtool-${VERSION} -PKGNAME-main= ${DISTNAME}p3 +PKGNAME-main= ${DISTNAME}p4 PKGNAME-ltdl= libltdl-${VERSION}p0 SHARED_LIBS= ltdl 4.5 MODGNU_SHARED_LIBS= ltdl '-no-undefined' @@ -17,10 +16,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:=libtool/} HOMEPAGE= http://www.gnu.org/software/libtool/ AUTOCONF_VERSION= 2.61 -MODULES= fortran -MODFORTRAN_WANTG77= Yes -BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \ - ${MODFORTRAN_BUILD_DEPENDS} +BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} MAINTAINER= Brad Smith @@ -32,18 +28,22 @@ PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --infodir=${PREFIX}/info - -# Strictly speaking, forcing GREP in MAKE_ENV should suffice, since the -# libtool reconfigures during the build. But we want to play it safe for -# future changes/updates, so force GREP in CONFIGURE_ENV, too. -CONFIGURE_ENV= GREP=/usr/bin/grep lt_cv_path_SED=/usr/bin/sed -MAKE_ENV= GREP=/usr/bin/grep lt_cv_path_SED=/usr/bin/sed + --infodir=${PREFIX}/info \ + GREP=/usr/bin/grep lt_cv_path_SED=/usr/bin/sed \ + ac_cv_prog_F77=g77 \ + ac_cv_f77_compiler_gnu=yes \ + ac_cv_prog_f77_g=yes \ + lt_cv_prog_compiler_pic_works_F77=yes \ + lt_cv_prog_compiler_static_works_F77=yes \ + lt_cv_prog_compiler_c_o_F77=yes MULTI_PACKAGES= -main -ltdl RUN_DEPENDS-main= ::devel/libtool,-ltdl +pre-configure: + cd ${WRKDIR}/bin && ln -sf /usr/bin/true g77 + do-regress: cd ${WRKDIR}/bin && ln -sf ${LOCALBASE}/bin/autoconf-2.61 autoconf cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} check