From 7e62a3c4267c232e155e6f46630f696891526e34 Mon Sep 17 00:00:00 2001 From: Thomas Gellekum Date: Tue, 6 Oct 1998 06:49:13 +0000 Subject: [PATCH] Support dynamic loading of modules in an ELF world. Submitted by: Vladimir Kushnir --- lang/python+ipv6/Makefile | 10 ++++++++-- lang/python+ipv6/files/patch-ab | 20 ++++++++++++++++++++ lang/python-devel/Makefile | 10 ++++++++-- lang/python/Makefile | 10 ++++++++-- lang/python15/Makefile | 10 ++++++++-- lang/python15/files/patch-ab | 20 ++++++++++++++++++++ lang/python20/Makefile | 10 ++++++++-- lang/python21/Makefile | 10 ++++++++-- lang/python22/Makefile | 10 ++++++++-- lang/python23/Makefile | 10 ++++++++-- lang/python24/Makefile | 10 ++++++++-- lang/python25/Makefile | 10 ++++++++-- lang/python26/Makefile | 10 ++++++++-- lang/python27/Makefile | 10 ++++++++-- lang/python30/Makefile | 10 ++++++++-- lang/python31/Makefile | 10 ++++++++-- lang/python32/Makefile | 10 ++++++++-- 17 files changed, 160 insertions(+), 30 deletions(-) create mode 100644 lang/python+ipv6/files/patch-ab create mode 100644 lang/python15/files/patch-ab diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python+ipv6/Makefile +++ b/lang/python+ipv6/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python+ipv6/files/patch-ab b/lang/python+ipv6/files/patch-ab new file mode 100644 index 000000000000..9ed08036511d --- /dev/null +++ b/lang/python+ipv6/files/patch-ab @@ -0,0 +1,20 @@ +*** Python/importdl.c.orig Tue Sep 29 12:17:52 1998 +--- Python/importdl.c Tue Sep 29 12:18:40 1998 +*************** +*** 211,217 **** + extern char *Py_GetProgramName(); + + #ifndef FUNCNAME_PATTERN +! #if defined(__hp9000s300) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__BORLANDC__) + #define FUNCNAME_PATTERN "_init%.200s" + #else + #define FUNCNAME_PATTERN "init%.200s" +--- 211,217 ---- + extern char *Py_GetProgramName(); + + #ifndef FUNCNAME_PATTERN +! #if defined(__hp9000s300) || defined(__NetBSD__) || (defined(__FreeBSD__) && !defined(__ELF__)) || defined(__OpenBSD__) || defined(__BORLANDC__) + #define FUNCNAME_PATTERN "_init%.200s" + #else + #define FUNCNAME_PATTERN "init%.200s" + diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python/Makefile b/lang/python/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python15/Makefile b/lang/python15/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python15/files/patch-ab b/lang/python15/files/patch-ab new file mode 100644 index 000000000000..9ed08036511d --- /dev/null +++ b/lang/python15/files/patch-ab @@ -0,0 +1,20 @@ +*** Python/importdl.c.orig Tue Sep 29 12:17:52 1998 +--- Python/importdl.c Tue Sep 29 12:18:40 1998 +*************** +*** 211,217 **** + extern char *Py_GetProgramName(); + + #ifndef FUNCNAME_PATTERN +! #if defined(__hp9000s300) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__BORLANDC__) + #define FUNCNAME_PATTERN "_init%.200s" + #else + #define FUNCNAME_PATTERN "init%.200s" +--- 211,217 ---- + extern char *Py_GetProgramName(); + + #ifndef FUNCNAME_PATTERN +! #if defined(__hp9000s300) || defined(__NetBSD__) || (defined(__FreeBSD__) && !defined(__ELF__)) || defined(__OpenBSD__) || defined(__BORLANDC__) + #define FUNCNAME_PATTERN "_init%.200s" + #else + #define FUNCNAME_PATTERN "init%.200s" + diff --git a/lang/python20/Makefile b/lang/python20/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python21/Makefile b/lang/python21/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python22/Makefile b/lang/python22/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python23/Makefile b/lang/python23/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 468b678a4932..491a1aa8f7a5 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.38 1998/08/07 23:56:28 asami Exp $ +# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ # DISTNAME= pyth151 @@ -24,7 +24,7 @@ PATCHFILES= _tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \ string.1.txt stringobject.1.txt stropmodule.1.txt \ timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt -MAINTAINER= tg@FreeBSD.org +MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= ${TK_DEPENDS} @@ -98,3 +98,9 @@ post-install: strip ${PREFIX}/bin/python .include + +# need to get ${PORTOBJFORMAT} +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif