cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to mm 1.2.1

Browse Source
This commit is contained in:
brad 2002-07-30 22:50:55 +00:00
parent 6fc89b97de
commit 70be3e46c5
8 changed files with 52 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devel/mm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2002/07/15 06:29:20 pvalchev Exp $
# $OpenBSD: Makefile,v 1.23 2002/07/30 22:50:55 brad Exp $
# $FreeBSD: Makefile,v 1.2 1999/03/28 11:55:25 rse Exp $
# XXX This will panic any vax
@ -6,13 +6,11 @@ NOT_FOR_ARCHS= vax
COMMENT= "shared memory lib for apps with pre-forked process model"
DISTNAME= mm-1.1.3
DISTNAME= mm-1.2.1
CATEGORIES= devel
NEED_VERSION= 1.363
MASTER_SITES= http://www.engelschall.com/sw/mm/ \
ftp://ftp.engelschall.com/sw/mm/
MASTER_SITES= ftp://ftp.ossp.org/pkg/lib/mm/
HOMEPAGE= http://www.engelschall.com/sw/mm/
HOMEPAGE= http://www.ossp.org/pkg/lib/mm/
MAINTAINER= Brad Smith <brad@openbsd.org>
@ -25,10 +23,6 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
post-build:
@${ECHO_MSG} "===> Use 'make test' to run a quick test suite."
test: build
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} -f ${MAKE_FILE} test
REGRESS_TARGET= test
.include <bsd.port.mk>

6
devel/mm/distinfo
View File

@ -1,3 +1,3 @@
MD5 (mm-1.1.3.tar.gz) = ba14a90239e26337eef079b698f35eae
RMD160 (mm-1.1.3.tar.gz) = b89f61a474a0019537757327c11862ebc78beb9a
SHA1 (mm-1.1.3.tar.gz) = 17430522a2c7de6175443393ad481372cc2da329
MD5 (mm-1.2.1.tar.gz) = 0ddd4c20d803cfda3dc585b8a5de708b
RMD160 (mm-1.2.1.tar.gz) = 35bfe0f5b8e8e7af6981c074be10e7d764bca19a
SHA1 (mm-1.2.1.tar.gz) = c2915c82adbf9be7b43375a5ced3dc08700b1810

38
devel/mm/patches/patch-Makefile.in
View File

@ -1,38 +0,0 @@
--- Makefile.in.orig Sat Jul 1 18:45:36 2000
+++ Makefile.in Sat Jul 1 18:46:43 2000
@@ -51,6 +51,8 @@
includedir = @includedir@
mandir = @mandir@
+DESTDIR =
+
SHELL = /bin/sh
CC = @CC@
CFLAGS = @CFLAGS@
@@ -157,16 +159,16 @@
shtoolize -o shtool version echo mkdir install fixperm tarball
install: all
- $(SHTOOL) mkdir -f -p -m 755 $(bindir)
- $(SHTOOL) mkdir -f -p -m 755 $(includedir)
- $(SHTOOL) mkdir -f -p -m 755 $(libdir)
- $(SHTOOL) mkdir -f -p -m 755 $(mandir)/man1
- $(SHTOOL) mkdir -f -p -m 755 $(mandir)/man3
- $(SHTOOL) install -c -m 755 mm-config $(bindir)/mm-config
- $(SHTOOL) install -c -m 644 mm-config.1 $(mandir)/man1/mm-config.1
- $(SHTOOL) install -c -m 644 mm.3 $(mandir)/man3/mm.3
- $(SHTOOL) install -c -m 644 mm.h $(includedir)/mm.h
- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libmm.la $(libdir)/libmm.la
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir)
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3
+ $(SHTOOL) install -c -m 755 mm-config $(DESTDIR)$(bindir)/mm-config
+ $(SHTOOL) install -c -m 644 mm-config.1 $(DESTDIR)$(mandir)/man1/mm-config.1
+ $(SHTOOL) install -c -m 644 mm.3 $(DESTDIR)$(mandir)/man3/mm.3
+ $(SHTOOL) install -c -m 644 mm.h $(DESTDIR)$(includedir)/mm.h
+ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libmm.la $(DESTDIR)$(libdir)/libmm.la
clean:
$(RM) mm_test mm_test.o mm_test.lo

25
devel/mm/patches/patch-configure Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-configure,v 1.1 2002/07/30 22:50:55 brad Exp $
--- configure.orig Tue Jul 30 18:40:16 2002
+++ configure Tue Jul 30 18:40:54 2002
@@ -5138,8 +5138,8 @@ else
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
export_dynamic_flag_spec='${wl}-E'
else
case "$host_os" in
@@ -5148,8 +5148,8 @@ else
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
;;
esac
fi

51
devel/mm/patches/patch-ltconfig
View File

@ -1,51 +0,0 @@
--- ltconfig.orig Sat Jul 1 10:13:38 2000
+++ ltconfig Tue Feb 20 13:48:53 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1402,10 +1405,21 @@ else
;;
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
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ 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'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2021,13 +2035,10 @@ netbsd*)
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
+ deplibs_check_method='pass_all'
;;
os2*)

67
devel/mm/patches/patch-ltmain.sh
View File

@ -1,57 +1,20 @@
--- ltmain.sh.orig Sat Jul 1 10:13:38 2000
+++ ltmain.sh Tue Feb 20 13:50:18 2001
@@ -1079,7 +1079,18 @@ compiler."
# These systems don't actually have c library (as such)
--- ltmain.sh.orig Tue Jul 30 18:42:37 2002
+++ ltmain.sh Tue Jul 30 18:44:15 2002
@@ -1737,11 +1737,6 @@ compiler."
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
fi
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1795,6 +1810,9 @@ compiler."
*-*-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.
+ ;;
*-*-rhapsody*)
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
@@ -2623,7 +2641,7 @@ static const void *lt_preloaded_setup()
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
case "$compile_command " in
*" -static "*) ;;
*) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4446,40 +4441,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
@ -61,7 +24,7 @@
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"

5
devel/mm/pkg/DESCR
View File

@ -1,7 +1,6 @@
MM - Shared Memory Library
Copyright (c) 1999 Ralf S. Engelschall, All rights reserved.
OSSP mm - Shared Memory Allocation
The MM library is a 2-layer abstraction library which simplifies
The OSSP mm library is a 2-layer abstraction library which simplifies
the usage of shared memory between forked (and this way strongly
related) processes under Unix platforms. On the first layer it
hides all platform dependent implementation details (allocation

4
devel/mm/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2000/07/01 22:30:12 brad Exp $
lib/libmm.so.11.23
@comment $OpenBSD: PFRAG.shared,v 1.2 2002/07/30 22:50:55 brad Exp $
lib/libmm.so.12.21
DYNLIBDIR(%B)