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

much cleaner version of the shared libs log

Browse Source
This commit is contained in:
espie 2006-10-21 13:31:51 +00:00
parent 72e2164084
commit dad78a0bc1
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/libtool/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.54 2006/10/21 11:22:29 espie Exp $ # $OpenBSD: Makefile,v 1.55 2006/10/21 13:31:51 espie Exp $
# $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $ # $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $
COMMENT= "generic shared library support script" COMMENT= "generic shared library support script"
@ -6,7 +6,7 @@ COMMENT-ltdl= "GNU libtool system independent dlopen wrapper"
VERSION= 1.5.22 VERSION= 1.5.22
DISTNAME= libtool-${VERSION} DISTNAME= libtool-${VERSION}
PKGNAME= ${DISTNAME}p1 PKGNAME= ${DISTNAME}p2
PKGNAME-ltdl= libltdl-${VERSION}p1 PKGNAME-ltdl= libltdl-${VERSION}p1
SHARED_LIBS= ltdl 4.3 SHARED_LIBS= ltdl 4.3
MODGNU_SHARED_LIBS= ltdl '-no-undefined' MODGNU_SHARED_LIBS= ltdl '-no-undefined'

44
devel/libtool/patches/patch-ltmain_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ltmain_in,v 1.19 2006/10/21 11:22:29 espie Exp $ $OpenBSD: patch-ltmain_in,v 1.20 2006/10/21 13:31:51 espie Exp $
--- ltmain.in.orig Sun Dec 18 22:43:52 2005 --- ltmain.in.orig Sun Dec 18 22:43:52 2005
+++ ltmain.in Sat Oct 21 13:11:59 2006 +++ ltmain.in Sat Oct 21 15:00:14 2006
@@ -2073,6 +2073,17 @@ EOF @@ -2073,6 +2073,17 @@ EOF
;; ;;
esac esac
@ -68,25 +68,31 @@ $OpenBSD: patch-ltmain_in,v 1.19 2006/10/21 11:22:29 espie Exp $
add="$libdir/$linklib" add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir" add_dir="-L$libdir"
@@ -3354,6 +3365,17 @@ EOF @@ -3359,6 +3370,23 @@ EOF
fi major=
versuffix=
verstring=""
+ else
+ # XXX
+ tmp=`echo $libname|sed -e 's,+,_,g' -e 's,-,_,g' -e 's,\.,_,g'`
+ eval tmp2=\$${tmp}_ltversion
+ if ! test -z "${SHARED_LIBS_LOG}"; then
+ if test -f ${SHARED_LIBS_LOG}; then
+ tmp3=" "
+ else
+ tmp3="SHARED_LIBS = "
+ echo "# SHARED_LIBS= <libname> <obsd version> # <orig version>" >${SHARED_LIBS_LOG}
+
+ fi
+ printf "%s %-20s %-8s # %s \\\\\n" "$tmp3" "$libname" "$tmp2" "$versuffix" >>${SHARED_LIBS_LOG}
+ fi
+ if test -n "$versuffix" && test -n "$tmp2"; then
+ versuffix=".$tmp2"
+ fi
fi fi
+ # XXX # Check to see if the archive will have undefined symbols.
+ tmp=`echo $libname|sed -e 's,+,_,g' -e 's,-,_,g' -e 's,\.,_,g'` @@ -6257,40 +6285,6 @@ relink_command=\"$relink_command\""
+ eval tmp2=\$${tmp}_ltversion
+ if ! test -z "${SHARED_LIBS_LOG}"; then
+ touch ${SHARED_LIBS_LOG}
+ echo "SHARED_LIBS += $libname $tmp2 # $versuffix" >>${SHARED_LIBS_LOG}
+ fi
+ if test -n "$versuffix" && test -n "$tmp2"; then
+ versuffix=".$tmp2"
+ fi
+
# Remove version info from name if versioning should be avoided
if test "$avoid_version" = yes && test "$need_version" = no; then
major=
@@ -6257,40 +6279,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode. # Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS test "$show" = : && exit $EXIT_SUCCESS