diff options
| author | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
| commit | f69d0aee59b843edb712e3c7201d67c1860a9902 (patch) | |
| tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /lang/python20 | |
| parent | 2045c3a17f778f4291f00ac8495b025fac1eb26c (diff) | |
| download | pkgsrc-f69d0aee59b843edb712e3c7201d67c1860a9902.tar.gz | |
(1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
Makefiles simply need to use this value often, for better or for
worse.
(2) Create a new variable FIX_RPATH that lists variables that should
be cleansed of -R or -rpath values if ${_USE_RPATH} is "no". By
default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
additional variables may be appended from package Makefiles.
Diffstat (limited to 'lang/python20')
| -rw-r--r-- | lang/python20/Makefile | 8 | ||||
| -rw-r--r-- | lang/python20/buildlink2.mk | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lang/python20/Makefile b/lang/python20/Makefile index cbeeded07f0..877dd1d5290 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/10/25 12:45:00 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2003/03/14 19:37:44 jlam Exp $ # DISTNAME= Python-2.0.1 @@ -32,7 +32,8 @@ SCRIPTS_ENV+= 'OPT=${CFLAGS}' SSLFLAGS= -DUSE_SSL -I${BUILDLINK_PREFIX.openssl}/include/openssl \ -L${BUILDLINK_PREFIX.openssl}/lib \ - -Wl,-R${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto +FIX_RPATH+= SSLFLAGS # Handle the module setup file: # - disable a few broken modules on 64 bit platforms (nothing important) @@ -41,7 +42,8 @@ SSLFLAGS= -DUSE_SSL -I${BUILDLINK_PREFIX.openssl}/include/openssl \ .if ${OPSYS} == "SunOS" ZOULARIS?= ${PREFIX}/bsd -MODADD= -I${ZOULARIS}/include -L${ZOULARIS}/lib -R${ZOULARIS}/lib +MODADD= -I${ZOULARIS}/include -L${ZOULARIS}/lib ${RPATH_FLAG}${ZOULARIS}/lib +FIX_RPATH+= MODADD .endif pre-configure: diff --git a/lang/python20/buildlink2.mk b/lang/python20/buildlink2.mk index da291768d4e..7260c60df8a 100644 --- a/lang/python20/buildlink2.mk +++ b/lang/python20/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.8 2002/10/13 07:16:51 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.9 2003/03/14 19:37:44 jlam Exp $ .if !defined(PYTHON20_BUILDLINK2_MK) PYTHON20_BUILDLINK2_MK= # defined @@ -25,7 +25,8 @@ BUILDLINK_CPPFLAGS.python20+= \ -I${BUILDLINK_PREFIX.python20}/include/python2.0 BUILDLINK_LDFLAGS.python20+= \ -L${BUILDLINK_PREFIX.python20}/lib/python2.0/config \ - -Wl,-R${BUILDLINK_PREFIX.python20}/lib/python2.0/config + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.python20}/lib/python2.0/config +FIX_RPATH+= BUILDLINK_LDFLAGS.python20 BUILDLINK_TARGETS+= python20-buildlink |