new patches to zshconfig_ac to build modules under ELF archs.

thanks brad@
This commit is contained in:
lebel 2001-09-07 02:11:47 +00:00
parent f82b4f5467
commit d20d8b69d1
2 changed files with 52 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2001/07/01 15:43:40 lebel Exp $ # $OpenBSD: Makefile,v 1.6 2001/09/07 02:11:47 lebel Exp $
COMMENT= "the Z shell, Bourne shell-compatible, release flavor" COMMENT= "the Z shell, Bourne shell-compatible, release flavor"
COMMENT-zftp= "the Z shell embedded ftp client" COMMENT-zftp= "the Z shell embedded ftp client"
@ -29,7 +29,7 @@ PERMIT_DISTFILES_FTP= Yes
FLAVORS= static FLAVORS= static
FLAVOR?= FLAVOR?=
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --enable-zsh-mem --enable-zsh-secure-free CONFIGURE_ARGS= --enable-zsh-mem --enable-zsh-secure-free
.if ${FLAVOR:L} == "static" .if ${FLAVOR:L} == "static"

View File

@ -0,0 +1,50 @@
$OpenBSD: patch-zshconfig_ac,v 1.1 2001/09/07 02:11:47 lebel Exp $
--- zshconfig.ac.orig Tue Jun 26 06:08:54 2001
+++ zshconfig.ac Thu Sep 6 13:24:37 2001
@@ -1602,7 +1602,14 @@ char *argv[];
else
case "$host" in
*openbsd*)
- DLLD="${DLLD=$CC}"
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ DLLD="${DLLD=ld}"
+ ;;
+ *)
+ DLLD="${DLLD=$CC}"
+ ;;
+ esac
DLLDARG="${LDARG}"
;;
* )
@@ -1630,11 +1637,29 @@ char *argv[];
netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
- openbsd*) DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}" ;;
+ openbsd*)
+ if test $zsh_cv_sys_elf = yes; then
+ DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ DLLDFLAGS="${DLLDFLAGS=-Bshareable}"
+ ;;
+ *)
+ DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
+ ;;
+ esac
+ fi
+ ;;
esac
case "$host" in
*-hpux*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" ;;
*-freebsd[3-9]*|*-linux*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
+ *openbsd*)
+ if test $zsh_cv_sys_elf = yes; then
+ EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}"
+ fi
+ ;;
mips-sni-sysv4)
#
# unfortunately, we have different compilers