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

SHARED_LIBS and USE_LIBTOOL

Browse Source 
ok pvalchev@
This commit is contained in:
steven 2005-12-25 23:23:47 +00:00
parent cc28e0febb
commit a349fa8ba5
5 changed files with 21 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
misc/libutf8/Makefile
View File

@ -1,12 +1,14 @@
# $OpenBSD: Makefile,v 1.13 2005/09/23 19:41:44 pvalchev Exp $
# $OpenBSD: Makefile,v 1.14 2005/12/25 23:23:47 steven Exp $
COMMENT= "provides UTF-8 locale support"
DISTNAME= libutf8-0.7.3
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
SHARED_LIBS= utf8 0.0
MODGNU_SHARED_LIBS= utf8 ''
CATEGORIES= misc devel
MASTER_SITES= ftp://ftp.ilog.fr/pub/Users/haible/utf8/ \
MASTER_SITES= ftp://ftp.ilog.fr/pub/Users/haible/utf8/ \
ftp://ftp.shellhung.org/pub/OpenBSD/packages/devel/
PERMIT_PACKAGE_CDROM= Yes
@ -14,6 +16,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autoconf

59
misc/libutf8/patches/patch-autoconf_ltconfig
View File

@ -1,59 +0,0 @@
$OpenBSD: patch-autoconf_ltconfig,v 1.2 2001/02/20 18:40:33 danh Exp $
--- autoconf/ltconfig.orig Tue Jul 4 04:38:15 2000
+++ autoconf/ltconfig Tue Feb 20 13:34:50 2001
@@ -707,6 +707,10 @@ amigaos* | beos* | sunos4*)
# On these operating systems, we should treat GNU ld like the system ld.
gnu_ld_acts_native=yes
;;
+openbsd*)
+ gnu_ld_acts_native=no
+ with_gnu_ld=no
+ ;;
*)
gnu_ld_acts_native=no
;;
@@ -826,10 +830,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib$libobjs'
- 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*)
@@ -1199,11 +1214,19 @@ linux-gnu*)
fi
;;
-netbsd* | openbsd*)
+netbsd*)
version_type=sunos
library_names_spec='${libname}${release}.so.$versuffix'
finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+openbsd*)
+ version_type=sunos
+ library_names_spec='${libname}${release}.so.$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

97
misc/libutf8/patches/patch-autoconf_ltmain_sh
View File

@ -1,97 +0,0 @@
$OpenBSD: patch-autoconf_ltmain_sh,v 1.2 2001/02/20 18:40:33 danh Exp $
--- autoconf/ltmain.sh.orig Mon Dec 21 19:28:47 1998
+++ autoconf/ltmain.sh Tue Feb 20 13:38:20 2001
@@ -507,7 +507,28 @@ if test -z "$show_help"; then
deplibs="$deplibs $arg"
;;
- -l*) deplibs="$deplibs $arg" ;;
+ -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"
+ ;;
-no-undefined)
allow_undefined=no
@@ -1002,9 +1023,23 @@ if test -z "$show_help"; then
allow_undefined_flag="$no_undefined_flag"
fi
- # Add libc to deplibs on all systems.
dependency_libs="$deplibs"
- deplibs="$deplibs -lc"
+ case "$host" in
+ *-*-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"
+ ;;
+ *)
+ # Add libc to deplibs on all other systems.
+ deplibs="$deplibs -lc"
+ ;;
+ esac
if test "$build_libtool_libs" = yes; then
# Get the real and link names of the library.
@@ -2025,37 +2060,6 @@ libdir='$install_libdir'\
done
fi
- echo "------------------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "To link against installed libraries in a given directory, LIBDIR,"
- echo "you must use the \`-LLIBDIR' flag during linking."
- echo
- echo " You will also need to do 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 -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
;;

12
misc/libutf8/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2005/12/25 23:23:47 steven Exp $
--- src/Makefile.in.orig Sun Dec 25 23:36:13 2005
+++ src/Makefile.in Sun Dec 25 23:35:59 2005
@@ -120,7 +120,7 @@ PLUG_SOURCES = \
all : libutf8.la @PLUGLIB@
libutf8.la : $(OBJECTS)
- $(LIBTOOL_LINK) $(CC) -o libutf8.la -rpath $(libdir) $(OBJECTS)
+ $(LIBTOOL_LINK) $(CC) -o libutf8.la $(libutf8_la_LDFLAGS) -rpath $(libdir) $(OBJECTS)
libutf8_plug.so : libutf8_plug_@OS@.so
$(RM) libutf8_plug.so

4
misc/libutf8/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 17:54:16 espie Exp $
@lib lib/libutf8.so.0.0
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/25 23:23:47 steven Exp $
@lib lib/libutf8.so.${LIButf8_VERSION}