SHARED_LIBS and USE_LIBTOOL
ok sturm@
This commit is contained in:
steven
parent
f34a1bad1c
commit
e121eb0d4f
@ -1,9 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.43 2004/12/07 00:23:22 alek Exp $
|
||||
# $OpenBSD: Makefile,v 1.44 2005/12/25 11:44:54 steven Exp $
|
||||
|
||||
COMMENT= "XSLT C Library for GNOME"
|
||||
|
||||
DISTNAME= libxslt-1.1.12
|
||||
PKGNAME= $(DISTNAME)p1
|
||||
PKGNAME= $(DISTNAME)p2
|
||||
SHARED_LIBS= exslt 9.0 \
|
||||
xslt 3.0
|
||||
MODGNU_SHARED_LIBS= exslt '' \
|
||||
xslt ''
|
||||
LIBexslt_ALIAS= realexslt
|
||||
|
||||
CATEGORIES= textproc
|
||||
|
||||
HOMEPAGE= http://xmlsoft.org/XSLT/
|
||||
@ -21,13 +27,11 @@ WANTLIB= c gpg-error iconv intl m z
|
||||
LIB_DEPENDS= xml2.8::textproc/libxml \
|
||||
gcrypt.12::security/libgcrypt
|
||||
|
||||
USE_LIBTOOL= Yes
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --with-libxml-include-prefix='${LOCALBASE}/include/'
|
||||
CONFIGURE_ARGS+= --without-python
|
||||
|
||||
MAKE_FLAGS= libxslt_la_LDFLAGS='-version-info 3:0:0' \
|
||||
libexslt_la_VERSION='-version-info 9:0:0'
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
$OpenBSD: patch-libexslt_Makefile_in,v 1.1 2004/11/11 22:08:13 espie Exp $
|
||||
--- libexslt/Makefile.in.orig Thu Nov 11 22:24:52 2004
|
||||
+++ libexslt/Makefile.in Thu Nov 11 22:25:49 2004
|
||||
@@ -261,7 +261,8 @@ libexslt_la_SOURCES = \
|
||||
$OpenBSD: patch-libexslt_Makefile_in,v 1.2 2005/12/25 11:44:54 steven Exp $
|
||||
--- libexslt/Makefile.in.orig Sun Dec 25 11:32:10 2005
|
||||
+++ libexslt/Makefile.in Sun Dec 25 11:32:40 2005
|
||||
@@ -261,7 +261,7 @@ libexslt_la_SOURCES = \
|
||||
dynamic.c
|
||||
|
||||
libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
|
||||
-libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ $(LIBGCRYPT_LIBS)
|
||||
+libexslt_la_VERSION = -version-info @LIBEXSLT_VERSION_INFO@
|
||||
+libexslt_la_LDFLAGS = $(libexslt_la_VERSION) $(LIBGCRYPT_LIBS)
|
||||
+libexslt_la_LDFLAGS = $(librealexslt_la_LDFLAGS) $(LIBGCRYPT_LIBS)
|
||||
man_MANS = libexslt.3
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
all: all-am
|
||||
|
||||
@ -1,93 +0,0 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.2 2004/04/08 06:32:43 marcm Exp $
|
||||
--- ltmain.sh.orig 2003-12-24 06:15:24.000000000 -0800
|
||||
+++ ltmain.sh 2004-02-23 20:51:34.000000000 -0800
|
||||
@@ -1290,6 +1290,17 @@ EOF
|
||||
continue
|
||||
;;
|
||||
|
||||
+ -pthread)
|
||||
+ case $host in
|
||||
+ *-*-openbsd*)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1961,6 +1972,19 @@ EOF
|
||||
fi
|
||||
continue
|
||||
;;
|
||||
+ -pthread)
|
||||
+ case $linkmode in
|
||||
+ lib)
|
||||
+ deplibs="$deplib $deplibs"
|
||||
+ newdependency_libs="$deplib $newdependency_libs"
|
||||
+ ;;
|
||||
+ prog)
|
||||
+ compile_deplibs="$deplib $compile_deplibs"
|
||||
+ finalize_deplibs="$deplib $finalize_deplibs"
|
||||
+ ;;
|
||||
+ esac
|
||||
+ continue
|
||||
+ ;;
|
||||
%DEPLIBS%)
|
||||
alldeplibs=yes
|
||||
continue
|
||||
@@ -2209,10 +2233,6 @@ EOF
|
||||
link_static=no # Whether the deplib will be linked statically
|
||||
if test -n "$library_names" &&
|
||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
- if test "$installed" = no; then
|
||||
- notinst_deplibs="$notinst_deplibs $lib"
|
||||
- need_relink=yes
|
||||
- fi
|
||||
# This is a shared library
|
||||
|
||||
# Warn about portability, can't link against -module's on some systems (darwin)
|
||||
@@ -5705,40 +5725,6 @@ relink_command=\"$relink_command\""
|
||||
# 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 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"
|
||||
- $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.30 2004/11/11 22:08:14 espie Exp $
|
||||
@lib lib/libexslt.so.9.0
|
||||
@lib lib/libxslt.so.3.0
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.31 2005/12/25 11:44:54 steven Exp $
|
||||
@lib lib/libexslt.so.${LIBexslt_VERSION}
|
||||
@lib lib/libxslt.so.${LIBxslt_VERSION}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user