From e9e21328ba9c97f31f320d0970fb6aa14c8a8bea Mon Sep 17 00:00:00 2001 From: stacktic Date: Mon, 16 Nov 2009 15:29:57 +0000 Subject: Fixed dlopen usage for Linux/x86_64 CentOS5 (RHEL5). Reported and Fixed by Nicolas Joly. Bump revision. --- misc/rump/Makefile | 10 ++++++++-- misc/rump/buildlink3.mk | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/misc/rump/Makefile b/misc/rump/Makefile index 1557f1a0da2..22ad46a895a 100644 --- a/misc/rump/Makefile +++ b/misc/rump/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2009/11/15 15:09:46 stacktic Exp $ +# $NetBSD: Makefile,v 1.14 2009/11/16 15:29:57 stacktic Exp $ # DISTNAME= rump_20091108 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= misc MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/stacktic/ @@ -43,6 +43,12 @@ SUBST_FILES.crt= share/mk/bsd.lib.mk share/mk/bsd.prog.mk SUBST_SED.crt= -e "s|lib/crt|lib$$\{LIBABISUFFIX\}/crt|" MAKEFLAGS+= LIBABISUFFIX=${LIBABISUFFIX} +SUBST_CLASSES+= dl +SUBST_STAGE.dl= pre-configure +SUBST_MESSAGE.dl= Fix dlopen. +SUBST_FILES.dl= lib/libukfs/ukfs.c +SUBST_SED.dl= -e "s|RTLD_GLOBAL|&\|RTLD_LAZY|" + MAKEFLAGS+= MACHINE=${MACHINE_ARCH:C/x86_64/amd64/} CRT_PATH!= gcc --print-file-name=crtbegin.o diff --git a/misc/rump/buildlink3.mk b/misc/rump/buildlink3.mk index 759a013dd06..fbb88878dad 100644 --- a/misc/rump/buildlink3.mk +++ b/misc/rump/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/11/05 08:36:00 stacktic Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/11/16 15:29:57 stacktic Exp $ BUILDLINK_TREE+= rump .if !defined(RUMP_BUILDLINK3_MK) RUMP_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.rump+= rump>=20091103 +BUILDLINK_API_DEPENDS.rump+= rump>=20091108nb3 BUILDLINK_PKGSRCDIR.rump?= ../../misc/rump .endif # RUMP_BUILDLINK3_MK -- cgit v1.2.3