Use $CC to link shared library to make sure crtbeginS.o gets linked in.

Switches CONFIGURE_STYLE to autoconf to make sure configure gets regenerated.

ok (and help from) sthen@
This commit is contained in:
kettenis 2015-05-16 10:15:53 +00:00
parent 1dedf79151
commit 5b67b7d496
2 changed files with 24 additions and 3 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.39 2015/03/14 22:26:21 sthen Exp $
# $OpenBSD: Makefile,v 1.40 2015/05/16 10:15:53 kettenis Exp $
COMMENT= Berkeley Internet Name Daemon: DNS server and tools
V= 9.10.2
REVISION= 0
REVISION= 1
DISTNAME= bind-$V
PKGNAME= isc-bind-${V:S/-P/pl/}
@ -39,7 +39,8 @@ MODPY_RUNDEP= No
LIB_DEPENDS= textproc/libxml
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-threads \
--with-libtool \

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-configure_in,v 1.1 2015/05/16 10:15:53 kettenis Exp $
--- configure.in.orig Wed Feb 18 02:55:55 2015
+++ configure.in Fri May 15 23:11:43 2015
@@ -4302,10 +4302,15 @@ if test "$dlopen" = "yes"; then
SO_LD="ld"
fi
;;
- *-freebsd*|*-openbsd*|*-netbsd*)
+ *-freebsd*|*-netbsd*)
SO_CFLAGS="-fpic"
SO_LDFLAGS="-Bshareable -x"
SO_LD="ld"
+ ;;
+ *-openbsd*)
+ SO_CFLAGS="-fpic"
+ SO_LDFLAGS="-shared"
+ SO_LD="${CC}"
;;
*-solaris*)
SO_CFLAGS="-KPIC"