SHARED_LIBS and USE_LIBTOOL
ok pvalchev@
This commit is contained in:
steven
parent
1ec348c316
commit
161d310795
@ -1,10 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.16 2005/09/04 23:31:36 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.17 2005/12/25 23:44:30 steven Exp $
|
||||
# $FreeBSD: Makefile,v 1.10 1998/09/03 00:05:11 jmacd Exp $
|
||||
|
||||
COMMENT= "binary delta generator and prototype RCS replacement"
|
||||
|
||||
DISTNAME= xdelta-1.1.1
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
PKGNAME= ${DISTNAME}p1
|
||||
SHARED_LIBS= edsio 0.0 \
|
||||
xdelta 11.1
|
||||
MODGNU_SHARED_LIBS= edsio '' \
|
||||
xdelta ''
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= ftp://ftp.xcf.berkeley.edu/pub/xdelta/
|
||||
|
||||
@ -19,6 +23,8 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c z
|
||||
|
||||
USE_LIBTOOL= Yes
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --enable-static
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2000/10/31 15:20:18 espie Exp $
|
||||
--- Makefile.in.orig Sat Apr 10 03:12:59 1999
|
||||
+++ Makefile.in Mon Oct 30 15:57:26 2000
|
||||
@@ -106,7 +106,7 @@ SUBDIRS = libedsio . doc
|
||||
m4datadir = $(datadir)/aclocal
|
||||
m4data_DATA = xdelta.m4
|
||||
|
||||
-libxdelta_la_LDFLAGS = -version-info 2:0:0
|
||||
+libxdelta_la_LDFLAGS = -version-info 11:1:0
|
||||
|
||||
SER_OUT = xd_edsio.h xd_edsio.c
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
$OpenBSD: patch-ltconfig,v 1.2 2001/02/20 20:16:52 danh Exp $
|
||||
--- ltconfig.orig Fri Apr 9 20:58:53 1999
|
||||
+++ ltconfig Tue Feb 20 15:15:26 2001
|
||||
@@ -1031,6 +1031,10 @@ freebsd2* | sunos4*)
|
||||
exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
|
||||
;;
|
||||
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
+
|
||||
esac
|
||||
|
||||
ld_shlibs=yes
|
||||
@@ -1262,10 +1266,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*)
|
||||
@@ -1789,13 +1804,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*)
|
||||
@ -1,80 +0,0 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.2 2001/02/20 20:16:52 danh Exp $
|
||||
--- ltmain.sh.orig Fri Apr 9 20:58:53 1999
|
||||
+++ ltmain.sh Tue Feb 20 15:16:34 2001
|
||||
@@ -1010,6 +1010,25 @@ compiler."
|
||||
;;
|
||||
|
||||
-l*)
|
||||
+ if test "$arg" = "-lc"; then
|
||||
+ case "$host" in
|
||||
+ *-*-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
|
||||
+ fi
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+
|
||||
+ -?thread)
|
||||
deplibs="$deplibs $arg"
|
||||
;;
|
||||
|
||||
@@ -1702,6 +1721,9 @@ compiler."
|
||||
*-*-cygwin* | *-*-mingw* | *-*-os2*)
|
||||
# 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"
|
||||
@@ -3326,40 +3348,6 @@ libdir='$install_libdir'\
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- done
|
||||
- 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 "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"
|
||||
- echo " during execution"
|
||||
- fi
|
||||
- if test -n "$runpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||
- echo " during linking"
|
||||
- fi
|
||||
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||
- libdir=LIBDIR
|
||||
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
-
|
||||
- echo " - use the \`$flag' linker flag"
|
||||
- fi
|
||||
- if test -n "$admincmds"; then
|
||||
- echo " - have your system administrator run these commands:$admincmds"
|
||||
- fi
|
||||
- if test -f /etc/ld.so.conf; then
|
||||
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||
- fi
|
||||
- echo
|
||||
- echo "See any operating system documentation about shared libraries for"
|
||||
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- echo "----------------------------------------------------------------------"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 17:54:17 espie Exp $
|
||||
@lib lib/libedsio.so.0.0
|
||||
@lib lib/libxdelta.so.11.1
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/25 23:44:30 steven Exp $
|
||||
@lib lib/libedsio.so.${LIBedsio_VERSION}
|
||||
@lib lib/libxdelta.so.${LIBxdelta_VERSION}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user