- use "cc -shared" on 2.8 and up to create shared libraries.

- add a test target as well as adding a patch to fix the lzo's test target
when using SEPARATE_BUILD.
This commit is contained in:
brad 2000-11-11 22:33:39 +00:00
parent 4311d928bb
commit 6105968cc3
4 changed files with 71 additions and 9 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.17 2000/09/24 07:03:59 brad Exp $
# $OpenBSD: Makefile,v 1.18 2000/11/11 22:33:39 brad Exp $
DISTNAME= lzo-1.06
CATEGORIES= archivers devel
NEED_VERSION= 1.330
NEED_VERSION= 1.336
MASTER_SITES= ftp://ftp.rhrz.uni-bonn.de/pub-koeln/util/arc/ \
ftp://ftp.fu-berlin.de/pub/unix/tools/archivers/lzo/ \
${MASTER_SITE_SUNSITE}
@ -22,7 +22,10 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
post-extract:
test: build
@cd ${WRKBUILD} && ${MAKE} test
post-patch:
@chmod +x ${WRKSRC}/acconfig/*
post-install:

View File

@ -0,0 +1,11 @@
--- Makefile.in.orig Sat Nov 11 17:01:12 2000
+++ Makefile.in Sat Nov 11 17:01:36 2000
@@ -422,7 +422,7 @@
test: all
./ltest/ltest -mavail -n10 -q $(top_srcdir)/COPYING
- $(SHELL) -e util/check.sh $(top_srcdir)
+ $(SHELL) -e $(srcdir)/util/check.sh $(top_srcdir)
./tests/align
./tests/chksum
./examples/simple

View File

@ -1,6 +1,44 @@
--- acconfig/ltconfig.orig Thu Aug 3 08:46:37 2000
+++ acconfig/ltconfig Thu Aug 3 08:47:04 2000
@@ -1962,6 +1962,7 @@
--- acconfig/ltconfig.orig Mon Nov 29 12:37:24 1999
+++ acconfig/ltconfig Sat Nov 11 16:32:04 2000
@@ -1105,6 +1105,9 @@
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1391,10 +1394,18 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd2.[01234567])
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
;;
os2*)
@@ -1955,13 +1966,10 @@
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH

View File

@ -1,6 +1,16 @@
--- acconfig/ltmain.sh.orig Sat Feb 5 11:38:56 2000
+++ acconfig/ltmain.sh Sat Feb 5 11:40:44 2000
@@ -3522,40 +3522,6 @@
--- acconfig/ltmain.sh.orig Mon Nov 29 12:37:24 1999
+++ acconfig/ltmain.sh Sat Nov 11 16:32:09 2000
@@ -1789,6 +1789,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
+ *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3522,40 +3525,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0