use in-tree libtool patches
prodded by wilfried@
This commit is contained in:
parent
e2f30ec424
commit
e1cc5912eb
@ -1,4 +1,4 @@
|
|||||||
# $OpenBSD: Makefile,v 1.5 2001/10/25 00:12:12 jcs Exp $
|
# $OpenBSD: Makefile,v 1.6 2001/11/01 02:40:55 jcs Exp $
|
||||||
|
|
||||||
DISTNAME= freetds-0.52
|
DISTNAME= freetds-0.52
|
||||||
CATEGORIES= databases
|
CATEGORIES= databases
|
||||||
@ -17,6 +17,10 @@ EXTRACT_SUFX= .tgz
|
|||||||
|
|
||||||
MAINTAINER= Joshua Stein <jcs@rt.fm>
|
MAINTAINER= Joshua Stein <jcs@rt.fm>
|
||||||
|
|
||||||
|
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltconfig \
|
||||||
|
${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltmain_sh \
|
||||||
|
patch-*
|
||||||
|
|
||||||
CONFIGURE_STYLE= gnu
|
CONFIGURE_STYLE= gnu
|
||||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||||
--enable-static \
|
--enable-static \
|
||||||
|
@ -1,52 +0,0 @@
|
|||||||
$OpenBSD: patch-ltconfig,v 1.1.1.1 2001/08/11 15:31:43 naddy Exp $
|
|
||||||
--- ltconfig.orig Sun Aug 22 04:19:30 1999
|
|
||||||
+++ ltconfig Sat Aug 11 02:58:00 2001
|
|
||||||
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
|
|
||||||
with_gnu_ld=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
+openbsd*)
|
|
||||||
+ with_gnu_ld=no
|
|
||||||
+ ;;
|
|
||||||
|
|
||||||
esac
|
|
||||||
|
|
||||||
@@ -1391,10 +1394,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*)
|
|
||||||
@@ -1955,13 +1969,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,81 +0,0 @@
|
|||||||
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/08/11 15:31:43 naddy Exp $
|
|
||||||
--- ltmain.sh.orig Sun Aug 22 04:19:30 1999
|
|
||||||
+++ ltmain.sh Sat Aug 11 02:58:00 2001
|
|
||||||
@@ -1080,11 +1080,26 @@ compiler."
|
|
||||||
# These systems don't actually have math library (as such)
|
|
||||||
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
|
|
||||||
fi
|
|
||||||
deplibs="$deplibs $arg"
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -?thread)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-module)
|
|
||||||
module=yes
|
|
||||||
continue
|
|
||||||
@@ -1789,6 +1804,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.
|
|
||||||
+ ;;
|
|
||||||
*)
|
|
||||||
# Add libc to deplibs on all other systems.
|
|
||||||
deplibs="$deplibs -lc"
|
|
||||||
@@ -3522,40 +3540,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
|
|
||||||
;;
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user